Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Remove obsolete endpoints

Manav Rathif9f14a863544
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 1a19414d34..8096da9e25 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -645,7 +645,6 @@ func main() {
trashHandler := &api.TrashHandler{
Controller: trashController,
}
- storageAPI.GET("/trash/diff", trashHandler.GetDiff)
storageAPI.GET("/trash/v2/diff", trashHandler.GetDiffV2)
storageAPI.POST("/trash/delete", trashHandler.Delete)
storageAPI.POST("/trash/empty", trashHandler.Empty)
@@ -927,7 +926,6 @@ func main() {
}
publicAPI.GET("/billing/plans/v2", billingHandler.GetPlansV2)
privateAPI.GET("/billing/user-plans", billingHandler.GetUserPlans)
- privateAPI.GET("/billing/usage", billingHandler.GetUsage)
privateAPI.GET("/billing/subscription", billingHandler.GetSubscription)
privateAPI.POST("/billing/verify-subscription", billingHandler.VerifySubscription)
publicAPI.POST("/billing/notify/android", billingHandler.AndroidNotificationHandler)
@@ -1079,9 +1077,6 @@ func main() {
embeddingController := embeddingCtrl.New(embeddingRepo, objectCleanupController, queueRepo, taskLockingRepo, fileRepo, hostName)
- offerHandler := &api.OfferHandler{Controller: offerController}
- publicAPI.GET("/offers/black-friday", offerHandler.GetBlackFridayOffers)
-
discountCouponRepository := &discountCouponRepo.Repository{DB: db}
discountCouponController := &discountCouponCtrl.Controller{
Repo: discountCouponRepository,
diff --git a/server/pkg/api/billing.go b/server/pkg/api/billing.go
index 1c5127d73d..9dc9d4d1f6 100644
--- a/server/pkg/api/billing.go
+++ b/server/pkg/api/billing.go
@@ -82,14 +82,6 @@ func (h *BillingHandler) GetStripeAccountCountry(c *gin.Context) {
})
}
-// Deprecated:
-// GetUsage returns the storage usage for the requesting user
-func (h *BillingHandler) GetUsage(c *gin.Context) {
- c.JSON(http.StatusGone, gin.H{
- "message": "This endpoint is deprecated.",
- })
-}
-
func (h *BillingHandler) GetSubscription(c *gin.Context) {
userID := auth.GetUserID(c.Request.Header)
subscription, err := h.Controller.GetSubscription(c, userID)
diff --git a/server/pkg/api/offer.go b/server/pkg/api/offer.go
deleted file mode 100644
index 3e1cae806f..0000000000
--- a/server/pkg/api/offer.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package api
-
-import (
- "net/http"
-
- "github.com/ente/museum/pkg/controller/offer"
- "github.com/gin-gonic/gin"
-)
-
-type OfferHandler struct {
- Controller *offer.OfferController
-}
-
-// Deprecated for now
-func (h *OfferHandler) GetBlackFridayOffers(c *gin.Context) {
- c.JSON(http.StatusOK, gin.H{
- "offers": []interface{}{},
- })
-}
diff --git a/server/pkg/api/trash.go b/server/pkg/api/trash.go
index cb14139001..82e9e8f974 100644
--- a/server/pkg/api/trash.go
+++ b/server/pkg/api/trash.go
@@ -16,29 +16,12 @@ type TrashHandler struct {
Controller *controller.TrashController
}
-// Deprecated, shutdown when there's no traffic for 30 days
-func (t *TrashHandler) GetDiff(c *gin.Context) {
- enteApp := auth.GetApp(c)
-
- userID := auth.GetUserID(c.Request.Header)
- sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)
- diff, hasMore, err := t.Controller.GetDiff(userID, sinceTime, false, enteApp)
- if err != nil {
- handler.Error(c, stacktrace.Propagate(err, ""))
- return
- }
- c.JSON(http.StatusOK, gin.H{
- "diff": diff,
- "hasMore": hasMore,
- })
-}
-
func (t *TrashHandler) GetDiffV2(c *gin.Context) {
enteApp := auth.GetApp(c)
userID := auth.GetUserID(c.Request.Header)
sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)
- diff, hasMore, err := t.Controller.GetDiff(userID, sinceTime, true, enteApp)
+ diff, hasMore, err := t.Controller.GetDiff(userID, sinceTime, enteApp)
if err != nil {
handler.Error(c, stacktrace.Propagate(err, ""))
return
diff --git a/server/pkg/controller/offer/offer.go b/server/pkg/controller/offer/offer.go
index 40f0d34015..0be8acd797 100644
--- a/server/pkg/controller/offer/offer.go
+++ b/server/pkg/controller/offer/offer.go
@@ -7,7 +7,6 @@ import (
"errors"
"fmt"
"os"
- "slices"
"github.com/ente/museum/pkg/controller/usercache"
@@ -16,7 +15,6 @@ import (
"github.com/ente/museum/pkg/controller/discord"
"github.com/ente/museum/pkg/repo"
"github.com/ente/museum/pkg/repo/storagebonus"
- "github.com/ente/museum/pkg/utils/billing"
"github.com/ente/museum/pkg/utils/config"
emailUtil "github.com/ente/museum/pkg/utils/email"
"github.com/ente/museum/pkg/utils/time"
@@ -60,18 +58,6 @@ func NewOfferController(
}
}
-func (c *OfferController) GetBlackFridayOffers(countryCode string) []ente.BlackFridayOffer {
- if slices.Contains(billing.CountriesInEU, countryCode) {
- countryCode = "EU"
- }
-
- if offers, found := c.BlackFridayOffers[countryCode]; found {
- return offers
- }
- defaultCountry := billing.GetDefaultPlanCountry()
- return c.BlackFridayOffers[defaultCountry]
-}
-
func (c *OfferController) ApplyOffer(email string, productID string) error {
var offerToBeApplied ente.BlackFridayOffer
found := false
diff --git a/server/pkg/controller/trash.go b/server/pkg/controller/trash.go
index 118ec38075..4b4f9cc117 100644
--- a/server/pkg/controller/trash.go
+++ b/server/pkg/controller/trash.go
@@ -27,20 +27,18 @@ type TrashController struct {
deleteAgedTrashRunning bool
}
-func (t *TrashController) GetDiff(userID int64, sinceTime int64, stripMetadata bool, app ente.App) ([]ente.Trash, bool, error) {
+func (t *TrashController) GetDiff(userID int64, sinceTime int64, app ente.App) ([]ente.Trash, bool, error) {
trashFilesDiff, hasMore, err := t.getDiff(userID, sinceTime, repo.TrashDiffLimit, app)
if err != nil {
return nil, false, err
}
// hide private metadata before returning files info in diff
- if stripMetadata {
- for _, trashFile := range trashFilesDiff {
- if trashFile.IsDeleted {
- trashFile.File.MagicMetadata = nil
- trashFile.File.PubicMagicMetadata = nil
- trashFile.File.Metadata = ente.FileAttributes{}
- trashFile.File.Info = nil
- }
+ for _, trashFile := range trashFilesDiff {
+ if trashFile.IsDeleted {
+ trashFile.File.MagicMetadata = nil
+ trashFile.File.PubicMagicMetadata = nil
+ trashFile.File.Metadata = ente.FileAttributes{}
+ trashFile.File.Info = nil
}
}
return trashFilesDiff, hasMore, err