chore: remove SMS word

Author: gsanchietti

README.md

@@ -1,6 +1,6 @@
 # Matrix to Acrobits Proxy
 
-This service acts as a proxy between an Acrobits softphone client and a Matrix homeserver, allowing users to send and receive Matrix messages through an SMS-like interface.
+This service acts as a proxy between an Acrobits softphone client and a Matrix homeserver, allowing users to send and receive Matrix messages through an -like interface.
 
 The proxy is written in Go and uses the following key technologies:
 - **Web Framework**: `github.com/labstack/echo/v4`
@@ -17,7 +17,7 @@ The proxy is configured via environment variables. Minimal required env:
 - `PROXY_PORT` (optional): port to listen on (default: `8080`)
 - `AS_USER_ID` (optional): the user ID of the Application Service bot (default: `@_acrobits_proxy:matrix.example`)
 - `LOGLEVEL` (optional): logging verbosity level - `DEBUG`, `INFO`, `WARNING`, `CRITICAL` (default: `INFO`)
-- `MAPPING_FILE` (optional): path to a JSON file containing SMS-to-Matrix mappings to load at startup
+- `MAPPING_FILE` (optional): path to a JSON file containing -to-Matrix mappings to load at startup
 - `PUSH_TOKEN_DB_PATH` (optional): path to a database file for storing push tokens
 
 Building and running
@@ -48,7 +48,7 @@ For debugging mapping and API issues, set `LOGLEVEL=DEBUG` to see detailed trace
 
 ### Loading Mappings from File
 
-You can pre-load SMS-to-Matrix mappings at startup by providing a `MAPPING_FILE` environment variable pointing to a JSON file. This is useful for initializing the proxy with a set of known mappings.
+You can pre-load -to-Matrix mappings at startup by providing a `MAPPING_FILE` environment variable pointing to a JSON file. This is useful for initializing the proxy with a set of known mappings.
 
 See `docs/example-mappings.json` for an example format.
 

api/routes.go

@@ -20,8 +20,8 @@ func RegisterRoutes(e *echo.Echo, svc *service.MessageService, adminToken string
 	e.POST("/api/client/send_message", h.sendMessage)
 	e.POST("/api/client/fetch_messages", h.fetchMessages)
 	e.POST("/api/client/push_token_report", h.pushTokenReport)
-	e.POST("/api/internal/map_sms_to_matrix", h.postMapping)
-	e.GET("/api/internal/map_sms_to_matrix", h.getMapping)
+	e.POST("/api/internal/map_number_to_matrix", h.postMapping)
+	e.GET("/api/internal/map_number_to_matrix", h.getMapping)
 	e.GET("/api/internal/push_tokens", h.getPushTokens)
 	e.DELETE("/api/internal/push_tokens", h.resetPushTokens)
 }
@@ -50,7 +50,7 @@ func (h handler) sendMessage(c echo.Context) error {
 		return mapServiceError(err)
 	}
 
-	logger.Info().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.To).Str("sms_id", resp.SMSID).Msg("message sent successfully")
+	logger.Info().Str("endpoint", "send_message").Str("from", req.From).Str("to", req.To).Str("message_id", resp.ID).Msg("message sent successfully")
 	return c.JSON(http.StatusOK, resp)
 }
 
@@ -69,7 +69,7 @@ func (h handler) fetchMessages(c echo.Context) error {
 		return mapServiceError(err)
 	}
 
-	logger.Info().Str("endpoint", "fetch_messages").Str("username", req.Username).Int("received", len(resp.ReceivedSMSS)).Int("sent", len(resp.SentSMSS)).Msg("messages fetched successfully")
+	logger.Info().Str("endpoint", "fetch_messages").Str("username", req.Username).Int("received", len(resp.ReceivedMessages)).Int("sent", len(resp.SentMessages)).Msg("messages fetched successfully")
 	return c.JSON(http.StatusOK, resp)
 }
 
@@ -103,15 +103,15 @@ func (h handler) postMapping(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, "invalid payload")
 	}
 
-	logger.Debug().Str("endpoint", "post_mapping").Str("sms_number", req.SMSNumber).Str("room_id", req.RoomID).Msg("saving mapping")
+	logger.Debug().Str("endpoint", "post_mapping").Str("number", req.Number).Str("room_id", req.RoomID).Msg("saving mapping")
 
 	resp, err := h.svc.SaveMapping(&req)
 	if err != nil {
-		logger.Error().Str("endpoint", "post_mapping").Str("sms_number", req.SMSNumber).Err(err).Msg("failed to save mapping")
+		logger.Error().Str("endpoint", "post_mapping").Str("number", req.Number).Err(err).Msg("failed to save mapping")
 		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
 	}
 
-	logger.Info().Str("endpoint", "post_mapping").Str("sms_number", req.SMSNumber).Str("room_id", req.RoomID).Msg("mapping saved successfully")
+	logger.Info().Str("endpoint", "post_mapping").Str("number", req.Number).Str("room_id", req.RoomID).Msg("mapping saved successfully")
 	return c.JSON(http.StatusOK, resp)
 }
 
@@ -120,10 +120,10 @@ func (h handler) getMapping(c echo.Context) error {
 		return err
 	}
 
-	smsNumber := strings.TrimSpace(c.QueryParam("sms_number"))
-	if smsNumber == "" {
+	number := strings.TrimSpace(c.QueryParam("number"))
+	if number == "" {
 		logger.Debug().Str("endpoint", "get_mapping").Msg("listing all mappings")
-		// return full mappings list when sms_number is not provided
+		// return full mappings list when number is not provided
 		respList, err := h.svc.ListMappings()
 		if err != nil {
 			logger.Error().Str("endpoint", "get_mapping").Err(err).Msg("failed to list mappings")
@@ -133,19 +133,19 @@ func (h handler) getMapping(c echo.Context) error {
 		return c.JSON(http.StatusOK, respList)
 	}
 
-	logger.Debug().Str("endpoint", "get_mapping").Str("sms_number", smsNumber).Msg("looking up mapping")
+	logger.Debug().Str("endpoint", "get_mapping").Str("number", number).Msg("looking up mapping")
 
-	resp, err := h.svc.LookupMapping(smsNumber)
+	resp, err := h.svc.LookupMapping(number)
 	if err != nil {
 		if errors.Is(err, service.ErrMappingNotFound) {
-			logger.Warn().Str("endpoint", "get_mapping").Str("sms_number", smsNumber).Msg("mapping not found")
+			logger.Warn().Str("endpoint", "get_mapping").Str("number", number).Msg("mapping not found")
 			return echo.NewHTTPError(http.StatusNotFound, err.Error())
 		}
-		logger.Error().Str("endpoint", "get_mapping").Str("sms_number", smsNumber).Err(err).Msg("failed to lookup mapping")
+		logger.Error().Str("endpoint", "get_mapping").Str("number", number).Err(err).Msg("failed to lookup mapping")
 		return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 	}
 
-	logger.Info().Str("endpoint", "get_mapping").Str("sms_number", smsNumber).Str("room_id", resp.RoomID).Msg("mapping found")
+	logger.Info().Str("endpoint", "get_mapping").Str("number", number).Str("room_id", resp.RoomID).Msg("mapping found")
 	return c.JSON(http.StatusOK, resp)
 }
 

docs/DEPLOY_NS8.md

@@ -139,7 +139,7 @@ curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message
 
 Response example:
 ```
-{"sms_id":"$VnrNZPmkkrgcqd2Lq15K9GKYuKXaNi-PrEsx6WLHfDs"}
+{"message":"$VnrNZPmkkrgcqd2Lq15K9GKYuKXaNi-PrEsx6WLHfDs"}
 ```
 
 Mario reply:
@@ -153,30 +153,30 @@ curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message
 ```
 
 
-Map SMS number (91201) to Matrix user (giacomo):
+Map  number (91201) to Matrix user (giacomo):
 ```
-curl "http://127.0.0.1:8080/api/internal/map_sms_to_matrix"   -H "Content-Type: application/json"   -H "X-Super-Admin-Token: secret"   -d '{
-  "sms_number": "91201",
+curl "http://127.0.0.1:8080/api/internal/map_number_to_matrix"   -H "Content-Type: application/json"   -H "X-Super-Admin-Token: secret"   -d '{
+  "number": "91201",
   "matrix_id": "@giacomo:synapse.gs.nethserver.net",
   "room_id": "!giacomo-room:synapse.gs.nethserver.net"
 }'
 ```
 
-Map SMS number (91202) to Matrix user (mario):
+Map  number (91202) to Matrix user (mario):
 ```
-curl "http://127.0.0.1:8080/api/internal/map_sms_to_matrix"   -H "Content-Type: application/json"   -H "X-Super-Admin-Token: secret"   -d '{
-  "sms_number": "91202",
+curl "http://127.0.0.1:8080/api/internal/map_number_to_matrix"   -H "Content-Type: application/json"   -H "X-Super-Admin-Token: secret"   -d '{
+  "number": "91202",
   "matrix_id": "@mario:synapse.gs.nethserver.net",
   "room_id": "!mario-room:synapse.gs.nethserver.net"
 }'
 ```
 
 Retrieve current mappings:
 ```
-curl "http://127.0.0.1:8080/api/internal/map_sms_to_matrix" -H "X-Super-Admin-Token: secret"
+curl "http://127.0.0.1:8080/api/internal/map_number_to_matrix" -H "X-Super-Admin-Token: secret"
 ```
 
-Send message using mapped SMS number (91201) - Giacomo to Mario:
+Send message using mapped  number (91201) - Giacomo to Mario:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "@giacomo:synapse.gs.nethserver.net",
@@ -186,7 +186,7 @@ curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message
   }'
 ```
 
-Send message using mapped SMS number (91202) - Mario to Giacomo:
+Send message using mapped  number (91202) - Mario to Giacomo:
 ```
 curl -s -X POST   https://synapse.gs.nethserver.net/m2a/api/client/send_message   -H "Content-Type: application/json"   -d '{
     "from": "@mario:synapse.gs.nethserver.net",

docs/example-mappings.json

@@ -1,12 +1,12 @@
 [
   {
-    "sms_number": "91201",
+    "number": "91201",
     "matrix_id": "@giacomo:synapse.gs.nethserver.net",
     "room_id": "!giacomo-room:synapse.gs.nethserver.net",
     "user_name": "Giacomo Rossi"
   },
   {
-    "sms_number": "91202",
+    "number": "91202",
     "matrix_id": "@mario:synapse.gs.nethserver.net",
     "room_id": "!mario-room:synapse.gs.nethserver.net",
     "user_name": "Mario Bianchi"

docs/openapi.yaml

@@ -34,7 +34,7 @@ paths:
                   description: The 'since' token from the last sync.
                 last_sent_id:
                   type: string
-                  description: The sms_id of the last sent message.
+                  description: The message id of the last sent message.
                 device:
                   type: string
                   description: Device identifier (e.g., 'ACROBITS').
@@ -57,7 +57,7 @@ paths:
 
         The `from` field can be:
         - A full Matrix ID (e.g., @user:server.com) - used directly
-        - A phone number (e.g., +1234567890) - resolved to Matrix ID via SMS-to-Matrix mapping if available
+        - A phone number (e.g., +1234567890) - resolved to Matrix ID via -to-Matrix mapping if available
 
         If a phone number is provided and a mapping exists, the message is sent on behalf of the mapped Matrix user.
         If a phone number is provided but no mapping exists, the phone number is used as the sender ID.
@@ -100,7 +100,7 @@ paths:
               schema:
                 type: object
                 properties:
-                  sms_id:
+                  message_id:
                     type: string
                     description: The Matrix event ID of the sent message.
         '400':
@@ -144,11 +144,11 @@ paths:
         response:
           {}
 
-  /api/internal/map_sms_to_matrix:
+  /api/internal/map_number_to_matrix:
     post:
-      summary: Register or update an SMS-to-Matrix mapping
+      summary: Register or update an -to-Matrix mapping
       description: |
-        Creates or overwrites the mapping between an SMS number (or other identifier) and
+        Creates or overwrites the mapping between an  number (or other identifier) and
         a Matrix room. Requires the `X-Super-Admin-Token` header.
       parameters:
         - in: header
@@ -187,11 +187,11 @@ paths:
           required: true
           description: The Application Service token (as_token).
         - in: query
-          name: sms_number
+          name: number
           schema:
             type: string
           required: false
-          description: The SMS number or identifier previously mapped. If omitted, the endpoint returns the full list of mappings.
+          description: The  number or identifier previously mapped. If omitted, the endpoint returns the full list of mappings.
       responses:
         '200':
           description: Mapping found
@@ -271,7 +271,7 @@ components:
     Message:
       type: object
       properties:
-        sms_id:
+        id:
           type: string
           description: Unique identifier (Matrix Event ID).
         sending_date:
@@ -284,7 +284,7 @@ components:
         recipient:
           type: string
           description: Recipient address/ID (Room ID).
-        sms_text:
+        text:
           type: string
           description: Message body.
         content_type:
@@ -300,23 +300,23 @@ components:
           type: string
           format: date-time
           description: Current server time in RFC 3339.
-        received_smss:
+        received_messages:
           type: array
           items:
             $ref: '#/components/schemas/Message'
-        sent_smss:
+        sent_messages:
           type: array
           items:
             $ref: '#/components/schemas/Message'
     MappingRequest:
       type: object
       required:
-        - sms_number
+        - number
         - room_id
       properties:
-        sms_number:
+        number:
           type: string
-          description: SMS number or bridged identifier to map.
+          description:  number or bridged identifier to map.
         matrix_id:
           type: string
           description: Optional Matrix user to use when auto-creating DMs.
@@ -329,7 +329,7 @@ components:
     MappingResponse:
       type: object
       properties:
-        sms_number:
+        number:
           type: string
         matrix_id:
           type: string

go.sum

@@ -30,7 +30,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8yjJKDIan90Nz0=
 github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=