🔧 Renames commands

admin/main.go

@@ -64,7 +64,7 @@ func makeGetReq(url string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer func() { res.Body.Close() }()
+	defer func() { _ = res.Body.Close() }()
 
 	if res.StatusCode != 200 {
 		fmt.Printf("<-- %d\n", res.StatusCode)
@@ -120,7 +120,7 @@ func main() {
 				Action: test,
 			},
 			{
-				Name:  "open",
+				Name:  "opened",
 				Usage: "get door state (opened or closed)",
 				Flags: []cli.Flag{
 					&cli.BoolFlag{
@@ -131,16 +131,16 @@ func main() {
 				Action: getOpened,
 			},
 			{
-				Name:  "lock",
+				Name:  "locked",
 				Usage: "change lock status",
 				Commands: []*cli.Command{
 					{
-						Name:   "on",
+						Name:   "yes",
 						Usage:  "lock the door",
 						Action: createManageLock(true),
 					},
 					{
-						Name:   "off",
+						Name:   "no",
 						Usage:  "unlock the door",
 						Action: createManageLock(false),
 					},
@@ -148,16 +148,16 @@ func main() {
 				Action: getLocked,
 			},
 			{
-				Name:  "alert",
+				Name:  "alerts",
 				Usage: "change alert status",
 				Commands: []*cli.Command{
 					{
-						Name:   "on",
+						Name:   "yes",
 						Usage:  "resume alerts",
 						Action: createManageAlert(true),
 					},
 					{
-						Name:  "off",
+						Name:  "no",
 						Usage: "pause alerts",
 						Flags: []cli.Flag{
 							&cli.StringFlag{
@@ -195,13 +195,13 @@ func test(context.Context, *cli.Command) error {
 	return nil
 }
 
-func getOpened(ctx context.Context, cmd *cli.Command) error {
+func getOpened(_ context.Context, cmd *cli.Command) error {
 	err := load()
 	if err != nil {
 		return err
 	}
 
-	opened, err := makeGetReq(fmt.Sprintf("%s/open", server))
+	opened, err := makeGetReq(fmt.Sprintf("%s/opened", server))
 	if err != nil {
 		return err
 	}
@@ -225,7 +225,7 @@ func getLocked(context.Context, *cli.Command) error {
 		return err
 	}
 
-	locked, err := makeGetReq(fmt.Sprintf("%s/lock", server))
+	locked, err := makeGetReq(fmt.Sprintf("%s/locked", server))
 	if err != nil {
 		return err
 	}
@@ -245,7 +245,7 @@ func getAlert(context.Context, *cli.Command) error {
 		return err
 	}
 
-	alert, err := makeGetReq(fmt.Sprintf("%s/alert", server))
+	alert, err := makeGetReq(fmt.Sprintf("%s/alerts", server))
 	if err != nil {
 		return err
 	}
@@ -269,7 +269,7 @@ func createManageLock(locked bool) func(context.Context, *cli.Command) error {
 		var data ChangeLockReq
 		data.Locked = locked
 
-		_, err = makePostReq(fmt.Sprintf("%s/lock", server), data)
+		_, err = makePostReq(fmt.Sprintf("%s/locked", server), data)
 		if err != nil {
 			return err
 		}
@@ -306,7 +306,7 @@ func createManageAlert(alert bool) func(context.Context, *cli.Command) error {
 			data.For = secs
 		}
 
-		_, err = makePostReq(fmt.Sprintf("%s/alert", server), data)
+		_, err = makePostReq(fmt.Sprintf("%s/alerts", server), data)
 		if err != nil {
 			return err
 		}

peripheral/main.py

@@ -97,7 +97,7 @@ class App:
 
         try:
             r = urequests.post(
-                f"{self.server}/open",
+                f"{self.server}/opened",
                 headers={"Authorization": self.token, "Content-Type": "application/json"},
                 data=raw
             )

web/pages/index.vue

@@ -100,7 +100,7 @@ async function toggleLock() {
     const desired = !locked.value
     axios
         .post(
-            useAPI("/lock"),
+            useAPI("/locked"),
             {
                 locked: desired,
             },
@@ -122,7 +122,7 @@ async function toggleLock() {
 async function toggleAlert() {
     const desired = !alert.value
     axios
-        .post(useAPI("/alert"), { alert: desired }, { headers: useHeaders() })
+        .post(useAPI("/alerts"), { alert: desired }, { headers: useHeaders() })
         .then((res) => {
             handleResponse(res, () => {
                 toast.add({
@@ -140,23 +140,23 @@ onMounted(() => {
     }
 
     axios
-        .get<boolean>(useAPI("/lock"), {
+        .get<boolean>(useAPI("/locked"), {
             headers: useHeaders(),
         })
         .then((res) => {
-            handleResponse(res, (response) => {
+            handleResponse(res, (res) => {
-                locked.value = response.data
+                locked.value = res.data
             })
         })
         .catch(handleRequestError)
 
     axios
-        .get<boolean>(useAPI("/alert"), {
+        .get<boolean>(useAPI("/alerts"), {
             headers: useHeaders(),
         })
         .then((res) => {
-            handleResponse(res, (response) => {
+            handleResponse(res, (res) => {
-                alert.value = response.data
+                alert.value = res.data
             })
         })
         .catch(handleRequestError)

web/pages/token.vue

@@ -39,7 +39,7 @@ const toast = useToast()
 function onSubmit(event: FormSubmitEvent<Schema>) {
     const received = event.data.token
     axios
-        .get<boolean>(useAPI("/open"), {
+        .get<boolean>(useAPI("/opened"), {
             headers: useHeaders(received),
         })
         .then((res) => {