fix linter2

cs3org · Sep 25, 2023 · dda9536 · dda9536
1 parent 7a68c5c
commit dda9536
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/internal/http/services/owncloud/ocs/conversions/role.go b/internal/http/services/owncloud/ocs/conversions/role.go
@@ -96,7 +96,7 @@ func (r *Role) OCSPermissions() Permissions {
 // S = Shared
 // R = Shareable
 // M = Mounted
-// Z = Deniable (NEW)
+// Z = Deniable (NEW).
 func (r *Role) WebDAVPermissions(isDir, isShared, isMountpoint, isPublic bool) string {
 	var b strings.Builder
 	if !isPublic && isShared {

diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go
@@ -245,7 +245,6 @@ func (h *Handler) listPublicShares(r *http.Request, filters []*link.ListPublicSh
 	}
 
 	return ocsDataPayload, nil, nil
-
 }
 
 func (h *Handler) isPublicShare(r *http.Request, oid string) bool {

diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
@@ -919,7 +919,6 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 						h.logProblems(status, err, "could not stat, skipping", log)
 						return
 					}
-
 				}
 
 				data, err := conversions.CS3Share2ShareData(r.Context(), rs.Share)

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -42,8 +42,8 @@ import (
 	"go.step.sm/crypto/randutil"
 
 	// gocritic is disabled because google.golang.org/protobuf/proto does not provide a method to convert MessageV1 to MessageV2.
-	"github.com/golang/protobuf/proto" //nolint:staticcheck
 	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
 )
 
 var (
@@ -210,14 +210,14 @@ func IsValidName(name string) bool {
 // MarshalProtoV1ToJSON marshals a proto V1 message to a JSON byte array
 // TODO: update this once we start using V2 in CS3APIs.
 func MarshalProtoV1ToJSON(m proto.Message) ([]byte, error) {
-	mV2 := proto.MessageV2(m)
+	mV2 := proto.Message(m)
 	return protojson.Marshal(mV2)
 }
 
 // UnmarshalJSONToProtoV1 decodes a JSON byte array to a specified proto message type
 // TODO: update this once we start using V2 in CS3APIs.
 func UnmarshalJSONToProtoV1(b []byte, m proto.Message) error {
-	mV2 := proto.MessageV2(m)
+	mV2 := proto.Message(m)
 	if err := protojson.Unmarshal(b, mV2); err != nil {
 		return err
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return ocsDataPayload, nil, nil
     }
     func (h *Handler) isPublicShare(r *http.Request, oid string) bool {
@@ Expand Down @@