Merge pull request #11 from tasnimzotder/dev

update client

Author: tasnimzotder

.DS_Store

@@ -2,7 +2,7 @@ name: Client Release
 
 on:
   push:
-    branches: [ 'main' ]
+    branches: ['main']
     tags:
       - 'v*'
 
@@ -11,8 +11,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-14, ubuntu-latest]  
-        arch: [amd64, arm64] 
+        os: [macos-14, ubuntu-latest]
+        arch: [amd64, arm64]
         exclude:
           - os: macos-14
             arch: amd64
@@ -21,7 +21,7 @@ jobs:
 
     defaults:
       run:
-        working-directory: ./client 
+        working-directory: ./client
 
     steps:
       - name: Checkout repository
@@ -41,7 +41,7 @@ jobs:
       - name: Set GOOS for macOS
         if: matrix.os == 'macos-14'
         run: echo "GOOS=darwin" >> $GITHUB_ENV
-      
+
       - name: Set GOOS for Ubuntu
         if: matrix.os == 'ubuntu-latest'
         run: echo "GOOS=linux" >> $GITHUB_ENV
@@ -51,49 +51,11 @@ jobs:
           CGO_ENABLED: 1
           GOOS: ${{ env.GOOS }}
           GOARCH: ${{ matrix.arch }}
-        run: go build -o client
+        run: go build -o /tmp/tchat.${{ env.GOOS }}.${{ matrix.arch }} -v
 
       - name: Upload client artifact
         uses: actions/upload-artifact@v3
         with:
-          name: tchat-${{ env.GOOS }}-${{ matrix.arch }} 
-          path: ./client 
-
-  # release:
-  #   # if: startsWith(github.ref, 'refs/tags/v')
-  #   needs: build
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Checkout code
-  #       uses: actions/checkout@v2
-
-  #     - name: Download client artifact
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         path: .
-        
-  #     - name: Create Release
-  #       id: create_release
-  #       uses: actions/create-release@v1
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #       with:
-  #         tag_name: ${{ github.ref }}
-  #         release_name: Release ${{ github.ref }}
-  #         body: |
-  #           Changes in this Release
-  #           - First Change
-  #           - Second Change
-  #         draft: true
-  #         prerelease: false
-    
-  #     - name: Upload release assets
-  #       uses: actions/upload-release-asset@v1
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #       with:
-  #         upload_url: ${{ steps.create_release.outputs.upload_url }}
-  #         asset_path: ./tchat-*-*
-  #         asset_name: tchat-*-*
-  #         asset_content_type: application/octet-stream
+          name: tchat.${{ env.GOOS }}.${{ matrix.arch }}
+          path: /tmp/tchat.${{ env.GOOS }}.${{ matrix.arch }}
+          

.github/workflows/release.yml

@@ -8,3 +8,6 @@ act-ci:
 act-cd:
 	act --container-architecture linux/amd64 \
 	--secret-file .env.local -W ./.github/workflows/cd.yml
+
+copy_server:
+	rsync -avz . root@tchat-api:/app/tchat --exclude client/bin --exclude webhook/venv

Makefile

@@ -1,5 +1,7 @@
 # tChat
 
+![logo](./assets/logo.png)
+
 Terminal chat application for developers. Share texts and files between users (or servers) using end-to-end encryption.
 
 ## Features

README.md

@@ -4,7 +4,7 @@ build_dev:
 build:
 	CGO_ENABLED=1 go build -o bin/tchat main.go
 
-bin:
+install:
 	sudo cp bin/tchat /usr/local/bin/tchat
 
 test:

WORK_DIR/client

@@ -2,11 +2,14 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"strconv"
 
+	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"github.com/tasnimzotder/tchat/_client/internal/display"
 	"github.com/tasnimzotder/tchat/_client/internal/storage"
+	"github.com/tasnimzotder/tchat/_client/pkg/file"
 )
 
 func messageCmd(storageClient *storage.Storage) *cobra.Command {
@@ -28,64 +31,53 @@ func messageCmd(storageClient *storage.Storage) *cobra.Command {
 	return _messageCmd
 }
 
-func messageCmdHandler(storageClient *storage.Storage, cmd *cobra.Command, args []string) error {
+func messageCmdHandler(storageClient *storage.Storage, cmd *cobra.Command, args []string) {
 	clearFlag, err := cmd.Flags().GetBool("clear")
 	if err != nil {
-		return err
+		return
 	}
 
 	displayFlag, err := cmd.Flags().GetBool("display")
 	if err != nil {
-		return err
+		return
 	}
 
 	saveFlag, err := cmd.Flags().GetBool("save")
 	if err != nil {
-		return err
+		return
 	}
 
-	if saveFlag {
-		// todo: implement
-		fmt.Println("Saving last message")
-	}
-
-	//sqlite, err := storage.NewSQLiteStorage()
-	//if err != nil {
-	//	return err
-	//}
-	//
-	//defer sqlite.Close()
-
 	userID, err := storageClient.GetUserID()
 	if err != nil {
-		return err
+		return
 	}
 
 	messages, err := storageClient.API.GetMessages(userID)
 	if err != nil {
-		return err
+		return
 	}
 
 	if clearFlag {
 		err = storageClient.DeleteMessages()
 
 		if err != nil {
-			return err
+			return
 		}
 
-		return nil
+		return
 	}
 
 	// save messages
 	err = storageClient.SaveMessages(messages)
 	if err != nil {
-		return err
+		return
 	}
 
 	// get messages
 	messages, err = storageClient.GetMessages()
 	if err != nil {
-		return err
+		display.Error("Failed to get messages")
+		return
 	}
 
 	// reverse messages
@@ -103,26 +95,92 @@ func messageCmdHandler(storageClient *storage.Storage, cmd *cobra.Command, args
 			// convert string to int
 			idx, err = strconv.Atoi(_idx)
 			if err != nil {
-				return err
+				display.Error("Invalid index")
+				return
 			}
 
 			if idx < 1 {
-				return fmt.Errorf("index cannot be less than 1")
+				display.Error("Index must be greater than 0")
+				return
 			}
 
 		}
 
 		if idx > len(messages) {
-			display.PrintMessage("error", "Index out of range")
+			// display.PrintMessage("error", "Index out of range")
+			display.Error("Index out of range")
 
-			return fmt.Errorf("index out of range")
+			// return fmt.Errorf("index out of range")
 		}
 
-		message := messages[len(messages)-idx]
+		message := messages[idx-1]
+		// fmt.Println(message.FileSize)
 		display.DisplaySingleMessage(storageClient, message)
 	} else {
 		display.DisplayMessages(storageClient, messages)
 	}
 
-	return nil
+	if saveFlag {
+		// todo: implement
+		fmt.Println("Saving last message")
+
+		idx := 1
+
+		if len(args) > 0 {
+			_idx := args[0]
+
+			// convert string to int
+			idx, err = strconv.Atoi(_idx)
+			if err != nil {
+				display.Error("Invalid index")
+				return
+			}
+
+			if idx < 1 {
+				display.Error("Index must be greater than 0")
+				return
+			}
+		}
+
+		if idx > len(messages) {
+			display.Error("Index out of range")
+		}
+
+		message := messages[idx-1]
+
+		if message.FileName == "" {
+			filenamePrompt := promptui.Prompt{
+				Label: "Enter filename",
+				Validate: func(input string) error {
+					if len(input) < 1 {
+						return fmt.Errorf("filename must be at least 1 character")
+					}
+					return nil
+
+				},
+			}
+
+			filename, err := filenamePrompt.Run()
+			if err != nil {
+				display.Error("Failed to get filename")
+				return
+			}
+
+			message.FileName = filename
+		}
+
+		// save file
+		currDir, err := os.Getwd()
+		if err != nil {
+			display.Error("Failed to get current directory")
+		}
+
+		filePath := currDir + "/" + message.FileName
+		err = file.SaveFile(filePath, []byte(message.Payload))
+		if err != nil {
+			display.Error("Failed to save file")
+		}
+
+		return
+	}
 }

assets/logo.png

@@ -2,7 +2,9 @@ package cmd
 
 import (
 	"fmt"
+
 	"github.com/spf13/cobra"
+	"github.com/tasnimzotder/tchat/_client/internal/display"
 	"github.com/tasnimzotder/tchat/_client/internal/storage"
 )
 
@@ -42,6 +44,8 @@ func Execute(storageClient *storage.Storage, versionStr string) error {
 	rootCmd.AddCommand(setupCmd(storageClient))
 	rootCmd.AddCommand(connectionCmd(storageClient))
 	rootCmd.AddCommand(messageCmd(storageClient))
+	rootCmd.AddCommand(sendMessageCmd(storageClient))
+	rootCmd.AddCommand(pingCmd(storageClient))
 
 	// flag for version
 	rootCmd.PersistentFlags().BoolP("version", "v", false, "Print version")
@@ -50,6 +54,21 @@ func Execute(storageClient *storage.Storage, versionStr string) error {
 	return rootCmd.Execute()
 }
 
+func pingCmd(storageClient *storage.Storage) *cobra.Command {
+	return &cobra.Command{
+		Use:   "ping",
+		Short: "Ping server",
+		Run: func(cmd *cobra.Command, args []string) {
+			err := storageClient.API.Ping()
+			if err != nil {
+				display.Error("Server is down")
+			} else {
+				display.Info("Server is up")
+			}
+		},
+	}
+}
+
 func printVersion(version string) error {
 	fmt.Println(version)
 	return nil