Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mystbin/frontend/components/EditorTabs.tsx

Author: EvieePy

mystbin/backend/main.py

@@ -1,9 +1,11 @@
+import argparse
 import json
 import os
 import pathlib
 import sys
 from typing import cast
 
+
 import uvicorn
 from uvicorn.supervisors import Multiprocess
 
@@ -24,20 +26,19 @@ def get_config() -> dict[str, dict[str, int | str]]:
 
     return data
 
-
-async def run_cli():
-    pass
-
-
-def run_cli_with_workers():
-    pass
-
-
 if __name__ == "__main__":
     cfg = get_config()
     port = cast(int, cfg["site"]["backend_port"])
-    use_workers = "--no-workers" not in sys.argv and cfg["redis"]["use-redis"]
-    use_cli = "--no-cli" not in sys.argv
+    parser = argparse.ArgumentParser(prog="Mystbin")
+    parser.add_argument("--no-workers", "-nw", action="store_true", default=False)
+    parser.add_argument("--no-cli", "-nc", action="store_true", default=False)
+    parser.add_argument("--workers", "-w", nargs=1, default=os.cpu_count() or 1)
+
+    ns = parser.parse_args(sys.argv[1:])
+    
+    use_workers: bool = not ns.no_workers
+    use_cli: bool = not ns.no_cli
+    worker_count: int = ns.workers
     _cli_path = pathlib.Path(".nocli")
 
     if not use_cli:
@@ -57,7 +58,7 @@ def run_cli_with_workers():
     server = uvicorn.Server(config)
 
     if use_workers:
-        config.workers = os.cpu_count() or 1
+        config.workers = worker_count
         sock = config.bind_socket()
 
         runner = Multiprocess(config, target=server.run, sockets=[sock])

mystbin/backend/utils/db.py

@@ -269,7 +269,7 @@ async def put_paste(
                         resp["id"],
                         page.content,
                         page.filename,
-                        page.content.count("\n"),
+                        page.content.count("\n") + 1, # add an extra for line 1
                     )
                 )
 
@@ -959,7 +959,7 @@ async def put_log(self, request: Request, response: Response) -> None:
         await self._do_query(
             query,
             request.headers.get("X-Forwarded-For", request.client.host),
-            request.state.user and request.state.user.id,
+            request.state.user and request.state.user["id"],
             datetime.datetime.utcnow(),
             request.headers.get("CF-RAY"),
             request.headers.get("CF-IPCOUNTRY"),

mystbin/frontend/components/EditorTabs.tsx

@@ -13,8 +13,7 @@ import { Button } from "@material-ui/core";
 import DropdownItem from "react-bootstrap/DropdownItem";
 import React from "react";
 import InsertPhotoIcon from "@material-ui/icons/InsertPhoto";
-import SettingsIcon from '@material-ui/icons/Settings';
-import {language} from "@hapi/accept";
+import SettingsIcon from "@material-ui/icons/Settings";
 
 const languages = {
   py: "python",
@@ -200,7 +199,7 @@ export default function EditorTabs({
                   </Button>
                   {langDropDown ? (
                     <div className={styles.langParent}>
-                      <Dropdown className={styles.dropDown} autoClose={'outside'}>
+                      <Dropdown className={styles.dropDown} autoClose>
                         {Object.keys(languages).map((v, index) => {
                           if (i !== currTab) {
                             return <></>;
@@ -214,7 +213,7 @@ export default function EditorTabs({
                               }}
                               onClick={() => {
                                 setLangDropDown(false);
-                                setDropLang(getLanguage(v));
+                                setDropLang(v);
                               }}
                             >
                               {v}