chore: use resource name in frontend

api/resource/resource.go

@@ -43,26 +43,22 @@ func NewService(profile *profile.Profile, store *store.Store) *Service {
 }
 
 func (s *Service) RegisterResourcePublicRoutes(g *echo.Group) {
-	g.GET("/r/:resourceId", s.streamResource)
-	g.GET("/r/:resourceId/*", s.streamResource)
+	g.GET("/r/:resourceName", s.streamResource)
+	g.GET("/r/:resourceName/*", s.streamResource)
 }
 
 func (s *Service) streamResource(c echo.Context) error {
 	ctx := c.Request().Context()
-	resourceID, err := util.ConvertStringToInt32(c.Param("resourceId"))
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
-	}
-
+	resourceName := c.Param("resourceName")
 	resource, err := s.Store.GetResource(ctx, &store.FindResource{
-		ID:      &resourceID,
-		GetBlob: true,
+		ResourceName: &resourceName,
+		GetBlob:      true,
 	})
 	if err != nil {
-		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find resource by ID: %v", resourceID)).SetInternal(err)
+		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find resource by id: %s", resourceName)).SetInternal(err)
 	}
 	if resource == nil {
-		return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Resource not found: %d", resourceID))
+		return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Resource not found: %s", resourceName))
 	}
 	// Check the related memo visibility.
 	if resource.MemoID != nil {

api/v1/resource.go

@@ -27,7 +27,8 @@ import (
 )
 
 type Resource struct {
-	ID int32 `json:"id"`
+	ID   int32  `json:"id"`
+	Name string `json:"name"`
 
 	// Standard fields
 	CreatorID int32 `json:"creatorId"`
@@ -368,6 +369,7 @@ func replacePathTemplate(path, filename string) string {
 func convertResourceFromStore(resource *store.Resource) *Resource {
 	return &Resource{
 		ID:           resource.ID,
+		Name:         resource.ResourceName,
 		CreatorID:    resource.CreatorID,
 		CreatedTs:    resource.CreatedTs,
 		UpdatedTs:    resource.UpdatedTs,

api/v1/rss.go

@@ -138,7 +138,7 @@ func (s *APIV1Service) generateRSSFromMemoList(ctx context.Context, memoList []*
 			if resource.ExternalLink != "" {
 				enclosure.Url = resource.ExternalLink
 			} else {
-				enclosure.Url = baseURL + "/o/r/" + fmt.Sprintf("%d", resource.ID)
+				enclosure.Url = baseURL + "/o/r/" + resource.Name
 			}
 			enclosure.Length = strconv.Itoa(int(resource.Size))
 			enclosure.Type = resource.Type

api/v2/resource_service.go

@@ -148,6 +148,7 @@ func (s *APIV2Service) convertResourceFromStore(ctx context.Context, resource *s
 
 	return &apiv2pb.Resource{
 		Id:           resource.ID,
+		Name:         resource.ResourceName,
 		CreateTime:   timestamppb.New(time.Unix(resource.CreatedTs, 0)),
 		Filename:     resource.Filename,
 		ExternalLink: resource.ExternalLink,

proto/api/v2/memo_service.proto

@@ -103,10 +103,10 @@ enum Visibility {
 }
 
 message Memo {
-  // id is the unique auto-incremented id.
+  // id is the system generated unique identifier.
   int32 id = 1;
 
-  // name is the user-defined name.
+  // name is the user provided name.
   string name = 2;
 
   RowStatus row_status = 3;

proto/api/v2/resource_service.proto

@@ -34,13 +34,23 @@ service ResourceService {
 }
 
 message Resource {
+  // id is the system generated unique identifier.
   int32 id = 1;
-  google.protobuf.Timestamp create_time = 2;
-  string filename = 3;
-  string external_link = 4;
-  string type = 5;
-  int64 size = 6;
-  optional int32 memo_id = 7;
+
+  // name is the user provided name.
+  string name = 2;
+
+  google.protobuf.Timestamp create_time = 3;
+
+  string filename = 4;
+
+  string external_link = 5;
+
+  string type = 6;
+
+  int64 size = 7;
+
+  optional int32 memo_id = 8;
 }
 
 message CreateResourceRequest {

proto/gen/api/v2/README.md

@@ -1705,7 +1705,8 @@
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| id | [int32](#int32) |  |  |
+| id | [int32](#int32) |  | id is the system generated unique identifier. |
+| name | [string](#string) |  | name is the user provided name. |
 | create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) |  |  |
 | filename | [string](#string) |  |  |
 | external_link | [string](#string) |  |  |
@@ -2104,8 +2105,8 @@
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| id | [int32](#int32) |  | id is the unique auto-incremented id. |
-| name | [string](#string) |  | name is the user-defined name. |
+| id | [int32](#int32) |  | id is the system generated unique identifier. |
+| name | [string](#string) |  | name is the user provided name. |
 | row_status | [RowStatus](#memos-api-v2-RowStatus) |  |  |
 | creator | [string](#string) |  | The name of the creator. Format: users/{username} |
 | creator_id | [int32](#int32) |  |  |

proto/gen/api/v2/memo_service.pb.go

@@ -80,9 +80,9 @@ type Memo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// id is the unique auto-incremented id.
+	// id is the system generated unique identifier.
 	Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	// name is the user-defined name.
+	// name is the user provided name.
 	Name      string    `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	RowStatus RowStatus `protobuf:"varint,3,opt,name=row_status,json=rowStatus,proto3,enum=memos.api.v2.RowStatus" json:"row_status,omitempty"`
 	// The name of the creator.

web/src/utils/resource.ts

@@ -5,7 +5,7 @@ export const getResourceUrl = (resource: Resource, withOrigin = true) => {
     return resource.externalLink;
   }
 
-  return `${withOrigin ? window.location.origin : ""}/o/r/${resource.id}`;
+  return `${withOrigin ? window.location.origin : ""}/o/r/${resource.name}`;
 };
 
 export const getResourceType = (resource: Resource) => {