Skip to content
Snippets Groups Projects
Unverified Commit 59e5ee77 authored by Travis Ralston's avatar Travis Ralston Committed by GitHub
Browse files

Merge pull request #328 from t3chguy/msc2448 

Iterate MSC2448 support
parents a3fa875b 6d0a11dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
api/custom/version.go
+ 0
− 1
View file @ 59e5ee77
...@@ -10,7 +10,6 @@ import ( ...@@ -10,7 +10,6 @@ import (
func GetVersion(r *http.Request, rctx rcontext.RequestContext, user api.UserInfo) interface{} { func GetVersion(r *http.Request, rctx rcontext.RequestContext, user api.UserInfo) interface{} {
unstableFeatures := make(map[string]bool) unstableFeatures := make(map[string]bool)
unstableFeatures["xyz.amorgan.blurhash"] = rctx.Config.Features.MSC2448Blurhash.Enabled
return &api.DoNotCacheResponse{ return &api.DoNotCacheResponse{
Payload: map[string]interface{}{ Payload: map[string]interface{}{
......
api/r0/upload.go
+ 1
− 1
View file @ 59e5ee77
...@@ -72,7 +72,7 @@ func UploadMedia(r *http.Request, rctx rcontext.RequestContext, user api.UserInf ...@@ -72,7 +72,7 @@ func UploadMedia(r *http.Request, rctx rcontext.RequestContext, user api.UserInf
return api.InternalServerError("Unexpected Error") return api.InternalServerError("Unexpected Error")
} }
if rctx.Config.Features.MSC2448Blurhash.Enabled { if rctx.Config.Features.MSC2448Blurhash.Enabled && r.URL.Query().Get("xyz.amorgan.generate_blurhash") == "true" {
hash, err := info_controller.GetOrCalculateBlurhash(media, rctx) hash, err := info_controller.GetOrCalculateBlurhash(media, rctx)
if err != nil { if err != nil {
rctx.Log.Warn("Failed to calculate blurhash: " + err.Error()) rctx.Log.Warn("Failed to calculate blurhash: " + err.Error())
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment