Merge pull request #80 from ragestudio/low-latency-streaming

other-fixes

.corenode

@@ -1,3 +1,3 @@
 {
-  "version": "0.28.3"
+  "version": "0.28.4"
 }

.vscode/settings.json

@@ -1,3 +1,23 @@
 {
-    "discord.enabled": false
+    "discord.enabled": false,
+    "workbench.colorCustomizations": {
+        "activityBar.activeBackground": "#65c89b",
+        "activityBar.background": "#65c89b",
+        "activityBar.foreground": "#15202b",
+        "activityBar.inactiveForeground": "#15202b99",
+        "activityBarBadge.background": "#945bc4",
+        "activityBarBadge.foreground": "#e7e7e7",
+        "commandCenter.border": "#15202b99",
+        "sash.hoverBorder": "#65c89b",
+        "statusBar.background": "#42b883",
+        "statusBar.foreground": "#15202b",
+        "statusBarItem.hoverBackground": "#359268",
+        "statusBarItem.remoteBackground": "#42b883",
+        "statusBarItem.remoteForeground": "#15202b",
+        "titleBar.activeBackground": "#42b883",
+        "titleBar.activeForeground": "#15202b",
+        "titleBar.inactiveBackground": "#42b88399",
+        "titleBar.inactiveForeground": "#15202b99"
+    },
+    "peacock.remoteColor": "#42b883"
 }

package.json

@@ -22,5 +22,5 @@
   "devDependencies": {
     "concurrently": "^7.5.0"
   },
-  "version": "0.28.3"
+  "version": "0.28.4"
 }

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comty",
-  "version": "0.28.3",
+  "version": "0.28.4",
   "license": "LGPL-2.1",
   "main": "electron/main",
   "author": "RageStudio",

packages/app/src/components/PostCreator/index.less

@@ -69,9 +69,15 @@
 
         .ant-upload {
             span {
-                width: fit-content !important;
+                width: 100%;
+
             }
 
+            svg {
+                margin: 0 !important;
+            }
+
+
             .ant-upload-select-picture-card {
                 background-color: transparent !important;
             }
@@ -112,7 +118,7 @@
             flex-direction: row;
 
             width: 100%;
-            
+
             overflow-x: auto;
             overflow-y: hidden;
 

packages/app/src/models/user/index.js

@@ -75,6 +75,26 @@ export default class User {
         return User.hasRole("admin")
     }
 
+    static async getUserBadges(user_id) {
+        if (!User.bridge) {
+            return false
+        }
+
+        if (!user_id) {
+            user_id = await User.selfUserId()
+        }
+
+        const { data } = await app.api.customRequest("main", {
+            method: "GET",
+            url: "/user/badges",
+            params: {
+                user_id: user_id,
+            }
+        })
+
+        return data
+    }
+
     static async register(payload) {
         if (!User.bridge) {
             return false

packages/app/src/pages/account/index.jsx

@@ -49,16 +49,17 @@ const TabRender = React.memo((props) => {
 const UserBadges = React.memo((props) => {
 	return React.createElement(Loadable({
 		loader: async () => {
-			let { badges } = props
+			let { user_id } = props
+
+			const badgesData = await User.getUserBadges(user_id).catch((err) => {
+				console.error(err)
+
+				app.message.error("Failed to fetch user badges")
 
-			if (!badges || Array.isArray(badges) === false || badges.length === 0) {
 				return null
-			}
+			})
 
-			// fetch badges datam from api
+			console.log(badgesData)
-			const badgesData = await app.api.request("main", "get", "badges", {
-				_id: badges
-			}).catch(() => false)
 
 			if (!badgesData) {
 				return null
@@ -286,7 +287,7 @@ export default class Account extends React.Component {
 
 				<div className="badgesTab">
 					<React.Suspense fallback={<antd.Skeleton />}>
-						<UserBadges badges={user.badges} />
+						<UserBadges user_id={user._id} />
 					</React.Suspense>
 				</div>
 			</div>

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comty/server",
-  "version": "0.28.3",
+  "version": "0.28.4",
   "main": "dist/index.js",
   "scripts": {
     "build": "corenode-cli build",

packages/server/src/controllers/BadgesController/index.js

@@ -28,6 +28,22 @@ export default class BadgesController extends Controller {
                 return res.json(badges)
             }
         }),
+        "/user/badges": {
+            middlewares: ["withAuthentication"],
+            fn: async (req, res) => {
+                const user = await User.findOne({ _id: req.query.user_id ?? req.user._id })
+
+                if (!user) {
+                    return res.status(404).json({ error: "User not found" })
+                }
+
+                const badges = await Badge.find({
+                    name: { $in: user.badges },
+                })
+
+                return res.json(badges)
+            }
+        }
     }
 
     post = {

packages/wrapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrapper",
-  "version": "0.28.3",
+  "version": "0.28.4",
   "main": "./src/index.js",
   "license": "MIT",
   "scripts": {