Merge pull request #38 from PoglyApp/0.1.2-release

0.1.2 release

Author: Dynrothe

README.md

@@ -23,7 +23,7 @@
      
     <a href="https://github.com/clockworklabs/spacetimedb"><img src="https://img.shields.io/badge/powered_by-SpacetimeDB-000000.svg?style=flat-square" /></a>
     &nbsp;
-	<img src="https://img.shields.io/badge/version-v0.1.1_beta-9f9f9f.svg?style=flat-square" />
+	<img src="https://img.shields.io/badge/version-v0.1.2_beta-9f9f9f.svg?style=flat-square" />
     &nbsp;
     <a href="https://github.com/PoglyApp/pogly-standalone/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-50C878.svg?style=flat-square" /></a>
 </p>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pogly-standalone",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "dependencies": {
     "@clockworklabs/spacetimedb-sdk": "^0.11.0",
@@ -14,8 +14,10 @@
     "css-filter-converter": "^1.0.109",
     "prismjs": "^1.29.0",
     "react": "^18.2.0",
+    "react-colorful": "^5.6.1",
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.6",
+    "react-dropzone": "^14.2.3",
     "react-moveable": "^0.56.0",
     "react-redux": "^9.0.4",
     "react-router-dom": "6.4",
@@ -25,6 +27,7 @@
     "react-toastify": "^9.1.3",
     "react-twitch-embed": "^3.0.2",
     "react-zoom-pan-pinch": "^3.4.4",
+    "reakeys": "^2.0.3",
     "styled-components": "^6.1.6",
     "typescript": "^4.9.5"
   },

package.json

@@ -59,7 +59,7 @@ public partial struct ZIndex
         public int Ceiling;
     }
 
-    private const string SEVEN_TV_TENOR_REGEX = @"^https?:\/\/(www\.)?cdn\.7tv\.app(?:\/.*)?$|^https?:\/\/(www\.)?media\.tenor\.com(?:\/.*)?$";
+    private const string SEVEN_TV_TENOR_REGEX = @"^https?:\/\/(www\.)?cdn\.7tv\.app(?:\/.*)?$|^https?:\/\/(www\.)?media\.tenor\.com(?:\/.*)?$|^https?:\/\/(www\.)?cdn\.betterttv\.net(?:\/.*)?$";
 
     private const string HTML_TAG_REGEX = @"<[^>]*>";
 }

server/Config/ConfigTables.cs

@@ -105,6 +105,30 @@ public static void UpdateGuestPosition(ReducerContext ctx, int positionX, int po
                 LogLevel.Error);
         }
     }
+    
+    [SpacetimeDB.Reducer]
+    public static void KickGuest(ReducerContext ctx, Identity identity)
+    {
+        string func = "KickGuest";
+        
+        if (!GetGuest(func, ctx.Sender, out var guest)) return;
+        if (!GuestAuthenticated(func, guest)) return;
+        if (!IsGuestOwner(func, ctx.Sender)) return;
+
+        try
+        {
+            var g = Guests.FindByIdentity(identity);
+            if (g is not null)
+            {
+                Guests.DeleteByIdentity(identity);
+            }
+        }
+        catch (Exception e)
+        {
+            Log($"[{func}] Encountered error kicking Guest, requested by {ctx.Sender}. " + e.Message,
+                LogLevel.Error);
+        }
+    }
 
     [SpacetimeDB.Reducer]
     public static void SetIdentityPermission(ReducerContext ctx, Identity identity, PermissionLevel permissionLevel)

server/Guests/GuestReducers.cs

@@ -6,6 +6,7 @@ import Permissions from "../../../module_bindings/permissions";
 import styled from "styled-components";
 import SetIdentityPermissionModeratorReducer from "../../../module_bindings/set_identity_permission_moderator_reducer";
 import ClearIdentityPermissionReducer from "../../../module_bindings/clear_identity_permission_reducer";
+import KickGuestReducer from "../../../module_bindings/kick_guest_reducer";
 
 interface IProps {
   contextMenu: any;
@@ -51,25 +52,36 @@ export const GuestListContextMenu = (props: IProps) => {
           </Paper>
 
           {!selectedGuest.identity.isEqual(Identity.identity) && identityPermission?.tag === "Owner" ? (
-            selectedGuestPermission?.tag === "Moderator" ? (
-              <StyledMenuItem
-                onClick={() => {
-                  ClearIdentityPermissionReducer.call(selectedGuest.identity);
-                  handleClose();
-                }}
-              >
-                Revoke Moderator
-              </StyledMenuItem>
-            ) : (
-              <StyledMenuItem
-                onClick={() => {
-                  SetIdentityPermissionModeratorReducer.call(selectedGuest.identity);
-                  handleClose();
-                }}
-              >
-                Grant Moderator
-              </StyledMenuItem>
-            )
+            <>
+              {selectedGuestPermission?.tag === "Moderator" ? (
+                <StyledMenuItemOrange
+                  onClick={() => {
+                    ClearIdentityPermissionReducer.call(selectedGuest.identity);
+                    handleClose();
+                  }}
+                  sx={{color:"#008205"}}
+                >
+                  Revoke Moderator
+                </StyledMenuItemOrange>
+              ) : (
+                <StyledMenuItemGreen
+                  onClick={() => {
+                    SetIdentityPermissionModeratorReducer.call(selectedGuest.identity);
+                    handleClose();
+                  }}
+                >
+                  Grant Moderator
+                </StyledMenuItemGreen>
+              )}
+                <StyledMenuItemRed
+                  onClick={() => {
+                    KickGuestReducer.call(selectedGuest.identity);
+                    handleClose();
+                  }}
+                >
+                  Kick Guest
+                </StyledMenuItemRed>
+              </>
           ) : (
             <></>
           )}
@@ -81,13 +93,41 @@ export const GuestListContextMenu = (props: IProps) => {
   );
 };
 
-const StyledMenuItem = styled(MenuItem)`
+const StyledMenuItemGreen = styled(MenuItem)`
   &:hover {
     background-color: #001529;
   }
 
+  color: #008205;
+
+  padding-left: 5px;
+
+  margin-left: 5px;
+  margin-right: 5px;
+`;
+
+const StyledMenuItemOrange = styled(MenuItem)`
+  &:hover {
+    background-color: #001529;
+  }
+
+  color: #CC5500;
+
   padding-left: 5px;
 
   margin-left: 5px;
   margin-right: 5px;
 `;
+
+const StyledMenuItemRed = styled(MenuItem)`
+  &:hover {
+    background-color: #001529;
+  }
+
+  color: #800000;
+
+  padding-left: 5px;
+
+  margin-left: 5px;
+  margin-right: 5px;
+`;