aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3097 from pixelfed/staging

Browse Source 
Staging
pull/3122/head
daniel 4 years ago committed by GitHub
parent 41758e37fb a259c6919f
commit f6426cb9bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG.md
Unescape Escape View File

@ -68,6 +68,7 @@
- Updated Webfinger, fixes #3050. ([ff7ee3bd](https://github.com/pixelfed/pixelfed/commit/ff7ee3bd)) - Updated Webfinger, fixes #3050. ([ff7ee3bd](https://github.com/pixelfed/pixelfed/commit/ff7ee3bd))
- Updated status api, autolink caption before returning response. ([b00a453b](https://github.com/pixelfed/pixelfed/commit/b00a453b)) - Updated status api, autolink caption before returning response. ([b00a453b](https://github.com/pixelfed/pixelfed/commit/b00a453b))
- Updated Timeline, add new ui promo in timelines that can be hidden using localstorage. ([e13959ae](https://github.com/pixelfed/pixelfed/commit/e13959ae)) - Updated Timeline, add new ui promo in timelines that can be hidden using localstorage. ([e13959ae](https://github.com/pixelfed/pixelfed/commit/e13959ae))
- Update FederationController, increase webfinger cache ttl from 12 hours to 14 days. ([745c3580](https://github.com/pixelfed/pixelfed/commit/745c3580))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

2
app/Http/Controllers/Admin/AdminReportController.php
Unescape Escape View File

@ -500,7 +500,7 @@ trait AdminReportController
return $account; return $account;
}) })
->filter(function($res) { ->filter(function($res) {
return isset($res['id']); return $res && isset($res['id']);
}) })
->values(); ->values();
} }

10
app/Http/Controllers/FederationController.php
Unescape Escape View File

@ -58,17 +58,17 @@ class FederationController extends Controller
if($cached = Cache::get($key)) { if($cached = Cache::get($key)) {
return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES); return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES);
} }
$domain = config('pixelfed.domain.app');
abort_if(strpos($resource, $domain) == false, 404);
$parsed = Nickname::normalizeProfileUrl($resource); $parsed = Nickname::normalizeProfileUrl($resource);
if(empty($parsed) || $parsed['domain'] !== config('pixelfed.domain.app')) { if(empty($parsed) || $parsed['domain'] !== $domain) {
abort(404); abort(404);
} }
$username = $parsed['username']; $username = $parsed['username'];
$profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail(); $profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
if($profile->status != null) { abort_if($profile->status != null, 404);
return ProfileController::accountCheck($profile);
}
$webfinger = (new Webfinger($profile))->generate(); $webfinger = (new Webfinger($profile))->generate();
Cache::put($key, $webfinger, 43200); Cache::put($key, $webfinger, 1209600);
return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES) return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
->header('Access-Control-Allow-Origin','*'); ->header('Access-Control-Allow-Origin','*');

8
public/_lang/el.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "\u03a7\u03ce\u03c1\u03bf\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2", "drive": "\u03a7\u03ce\u03c1\u03bf\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2",
"settings": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2", "settings": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2",
"compose": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03bd\u03ad\u03bf\u03c5", "compose": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03bd\u03ad\u03bf\u03c5",
"logout": "Logout", "logout": "\u0391\u03c0\u03bf\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7",
"about": "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5", "about": "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5",
"help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1", "help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
"language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1", "language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
@ -92,8 +92,8 @@
"editProfile": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03a0\u03c1\u03bf\u03c6\u03af\u03bb", "editProfile": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03a0\u03c1\u03bf\u03c6\u03af\u03bb",
"followRequested": "\u0391\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03a4\u03bf \u0391\u03af\u03c4\u03b7\u03bc\u03b1", "followRequested": "\u0391\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03a4\u03bf \u0391\u03af\u03c4\u03b7\u03bc\u03b1",
"joined": "Joined", "joined": "Joined",
"emptyCollections": "We can't seem to find any collections", "emptyCollections": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bc\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03bf\u03cd\u03bc\u03b5 \u03c3\u03c5\u03bb\u03bb\u03bf\u03b3\u03ad\u03c2",
"emptyPosts": "We can't seem to find any posts" "emptyPosts": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bc\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03bf\u03cd\u03bc\u03b5 \u03b4\u03b7\u03bc\u03bf\u03c3\u03b9\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2"
}, },
"menu": { "menu": {
"viewPost": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03b7 \u0394\u03b7\u03bc\u03bf\u03c3\u03af\u03b5\u03c5\u03c3\u03b7\u03c2", "viewPost": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03b7 \u0394\u03b7\u03bc\u03bf\u03c3\u03af\u03b5\u03c5\u03c3\u03b7\u03c2",
@ -145,6 +145,6 @@
"peopleYouMayKnow": "\u0386\u03c4\u03bf\u03bc\u03b1 \u03c0\u03bf\u03c5 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03be\u03ad\u03c1\u03b5\u03c4\u03b5" "peopleYouMayKnow": "\u0386\u03c4\u03bf\u03bc\u03b1 \u03c0\u03bf\u03c5 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03be\u03ad\u03c1\u03b5\u03c4\u03b5"
}, },
"hashtags": { "hashtags": {
"emptyFeed": "We can't seem to find any posts for this hashtag" "emptyFeed": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bc\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03bf\u03cd\u03bc\u03b5 \u03b4\u03b7\u03bc\u03bf\u03c3\u03b9\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf hashtag"
} }
} }

2
public/_lang/he.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "\u05db\u05d5\u05e0\u05df (\u05d3\u05e8\u05d9\u05d9\u05d1)", "drive": "\u05db\u05d5\u05e0\u05df (\u05d3\u05e8\u05d9\u05d9\u05d1)",
"settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea", "settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea",
"compose": "\u05e6\u05e8\u05d5 \u05d7\u05d3\u05e9", "compose": "\u05e6\u05e8\u05d5 \u05d7\u05d3\u05e9",
"logout": "Logout", "logout": "\u05d4\u05ea\u05e0\u05ea\u05e7/\u05d9",
"about": "\u05d0\u05d5\u05d3\u05d5\u05ea", "about": "\u05d0\u05d5\u05d3\u05d5\u05ea",
"help": "\u05e2\u05d6\u05e8\u05d4", "help": "\u05e2\u05d6\u05e8\u05d4",
"language": "\u05e9\u05e4\u05d4", "language": "\u05e9\u05e4\u05d4",

2
public/_lang/id.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "Perangkat Keras", "drive": "Perangkat Keras",
"settings": "Pengaturan", "settings": "Pengaturan",
"compose": "Membuat baru", "compose": "Membuat baru",
"logout": "Logout", "logout": "Keluar",
"about": "Tentang", "about": "Tentang",
"help": "Bantuan", "help": "Bantuan",
"language": "Bahasa", "language": "Bahasa",

2
public/_lang/ja.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "\u30c9\u30e9\u30a4\u30d6", "drive": "\u30c9\u30e9\u30a4\u30d6",
"settings": "\u8a2d\u5b9a", "settings": "\u8a2d\u5b9a",
"compose": "\u65b0\u898f\u6295\u7a3f", "compose": "\u65b0\u898f\u6295\u7a3f",
"logout": "Logout", "logout": "\u30ed\u30b0\u30a2\u30a6\u30c8",
"about": "\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u3064\u3044\u3066", "about": "\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u3064\u3044\u3066",
"help": "\u30d8\u30eb\u30d7", "help": "\u30d8\u30eb\u30d7",
"language": "\u8a00\u8a9e", "language": "\u8a00\u8a9e",

2
public/js/spa.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
Unescape Escape View File

@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=2ef46b249c6390aa4ef8", "/js/rempos.js": "/js/rempos.js?id=2ef46b249c6390aa4ef8",
"/js/rempro.js": "/js/rempro.js?id=3971b84aef886204d286", "/js/rempro.js": "/js/rempro.js?id=3971b84aef886204d286",
"/js/search.js": "/js/search.js?id=dc888b173463dc3894ba", "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
"/js/spa.js": "/js/spa.js?id=3d13081209bd13354ddb", "/js/spa.js": "/js/spa.js?id=644bcc4d820f98ac07f6",
"/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9", "/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7", "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a", "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",

8
resources/assets/js/i18n/el.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "\u03a7\u03ce\u03c1\u03bf\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2", "drive": "\u03a7\u03ce\u03c1\u03bf\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2",
"settings": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2", "settings": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2",
"compose": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03bd\u03ad\u03bf\u03c5", "compose": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03bd\u03ad\u03bf\u03c5",
"logout": "Logout", "logout": "\u0391\u03c0\u03bf\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7",
"about": "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5", "about": "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5",
"help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1", "help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
"language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1", "language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
@ -92,8 +92,8 @@
"editProfile": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03a0\u03c1\u03bf\u03c6\u03af\u03bb", "editProfile": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03a0\u03c1\u03bf\u03c6\u03af\u03bb",
"followRequested": "\u0391\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03a4\u03bf \u0391\u03af\u03c4\u03b7\u03bc\u03b1", "followRequested": "\u0391\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03a4\u03bf \u0391\u03af\u03c4\u03b7\u03bc\u03b1",
"joined": "Joined", "joined": "Joined",
"emptyCollections": "We can't seem to find any collections", "emptyCollections": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bc\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03bf\u03cd\u03bc\u03b5 \u03c3\u03c5\u03bb\u03bb\u03bf\u03b3\u03ad\u03c2",
"emptyPosts": "We can't seem to find any posts" "emptyPosts": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bc\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03bf\u03cd\u03bc\u03b5 \u03b4\u03b7\u03bc\u03bf\u03c3\u03b9\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2"
}, },
"menu": { "menu": {
"viewPost": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03b7 \u0394\u03b7\u03bc\u03bf\u03c3\u03af\u03b5\u03c5\u03c3\u03b7\u03c2", "viewPost": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03b7 \u0394\u03b7\u03bc\u03bf\u03c3\u03af\u03b5\u03c5\u03c3\u03b7\u03c2",
@ -145,6 +145,6 @@
"peopleYouMayKnow": "\u0386\u03c4\u03bf\u03bc\u03b1 \u03c0\u03bf\u03c5 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03be\u03ad\u03c1\u03b5\u03c4\u03b5" "peopleYouMayKnow": "\u0386\u03c4\u03bf\u03bc\u03b1 \u03c0\u03bf\u03c5 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03be\u03ad\u03c1\u03b5\u03c4\u03b5"
}, },
"hashtags": { "hashtags": {
"emptyFeed": "We can't seem to find any posts for this hashtag" "emptyFeed": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bc\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03bf\u03cd\u03bc\u03b5 \u03b4\u03b7\u03bc\u03bf\u03c3\u03b9\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf hashtag"
} }
} }

2
resources/assets/js/i18n/he.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "\u05db\u05d5\u05e0\u05df (\u05d3\u05e8\u05d9\u05d9\u05d1)", "drive": "\u05db\u05d5\u05e0\u05df (\u05d3\u05e8\u05d9\u05d9\u05d1)",
"settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea", "settings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea",
"compose": "\u05e6\u05e8\u05d5 \u05d7\u05d3\u05e9", "compose": "\u05e6\u05e8\u05d5 \u05d7\u05d3\u05e9",
"logout": "Logout", "logout": "\u05d4\u05ea\u05e0\u05ea\u05e7/\u05d9",
"about": "\u05d0\u05d5\u05d3\u05d5\u05ea", "about": "\u05d0\u05d5\u05d3\u05d5\u05ea",
"help": "\u05e2\u05d6\u05e8\u05d4", "help": "\u05e2\u05d6\u05e8\u05d4",
"language": "\u05e9\u05e4\u05d4", "language": "\u05e9\u05e4\u05d4",

2
resources/assets/js/i18n/id.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "Perangkat Keras", "drive": "Perangkat Keras",
"settings": "Pengaturan", "settings": "Pengaturan",
"compose": "Membuat baru", "compose": "Membuat baru",
"logout": "Logout", "logout": "Keluar",
"about": "Tentang", "about": "Tentang",
"help": "Bantuan", "help": "Bantuan",
"language": "Bahasa", "language": "Bahasa",

2
resources/assets/js/i18n/ja.json
Unescape Escape View File

@ -42,7 +42,7 @@
"drive": "\u30c9\u30e9\u30a4\u30d6", "drive": "\u30c9\u30e9\u30a4\u30d6",
"settings": "\u8a2d\u5b9a", "settings": "\u8a2d\u5b9a",
"compose": "\u65b0\u898f\u6295\u7a3f", "compose": "\u65b0\u898f\u6295\u7a3f",
"logout": "Logout", "logout": "\u30ed\u30b0\u30a2\u30a6\u30c8",
"about": "\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u3064\u3044\u3066", "about": "\u3053\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u3064\u3044\u3066",
"help": "\u30d8\u30eb\u30d7", "help": "\u30d8\u30eb\u30d7",
"language": "\u8a00\u8a9e", "language": "\u8a00\u8a9e",

8
resources/lang/el/web.php
Unescape Escape View File

@ -55,7 +55,7 @@ return [
'drive' => 'Χώρος αποθήκευσης', 'drive' => 'Χώρος αποθήκευσης',
'settings' => 'Ρυθμίσεις', 'settings' => 'Ρυθμίσεις',
'compose' => 'Δημιουργία νέου', 'compose' => 'Δημιουργία νέου',
'logout' => 'Logout', 'logout' => 'Αποσύνδεση',
// Nav footer // Nav footer
'about' => 'Σχετικά με', 'about' => 'Σχετικά με',
@ -118,8 +118,8 @@ return [
'followRequested' => 'Ακολουθήστε Το Αίτημα', 'followRequested' => 'Ακολουθήστε Το Αίτημα',
'joined' => 'Joined', 'joined' => 'Joined',
'emptyCollections' => 'We can\'t seem to find any collections', 'emptyCollections' => 'Δεν μπορούμε να βρούμε συλλογές',
'emptyPosts' => 'We can\'t seem to find any posts', 'emptyPosts' => 'Δεν μπορούμε να βρούμε δημοσιεύσεις',
], ],
'menu' => [ 'menu' => [
@ -180,7 +180,7 @@ return [
], ],
'hashtags' => [ 'hashtags' => [
'emptyFeed' => 'We can\'t seem to find any posts for this hashtag' 'emptyFeed' => 'Δεν μπορούμε να βρούμε δημοσιεύσεις για αυτό το hashtag'
], ],
]; ];

2
resources/lang/he/web.php
Unescape Escape View File

@ -55,7 +55,7 @@ return [
'drive' => 'כונן (דרייב)', 'drive' => 'כונן (דרייב)',
'settings' => 'הגדרות', 'settings' => 'הגדרות',
'compose' => 'צרו חדש', 'compose' => 'צרו חדש',
'logout' => 'Logout', 'logout' => 'התנתק/י',
// Nav footer // Nav footer
'about' => 'אודות', 'about' => 'אודות',

2
resources/lang/id/web.php
Unescape Escape View File

@ -55,7 +55,7 @@ return [
'drive' => 'Perangkat Keras', 'drive' => 'Perangkat Keras',
'settings' => 'Pengaturan', 'settings' => 'Pengaturan',
'compose' => 'Membuat baru', 'compose' => 'Membuat baru',
'logout' => 'Logout', 'logout' => 'Keluar',
// Nav footer // Nav footer
'about' => 'Tentang', 'about' => 'Tentang',

2
resources/lang/ja/web.php
Unescape Escape View File

@ -55,7 +55,7 @@ return [
'drive' => 'ドライブ', 'drive' => 'ドライブ',
'settings' => '設定', 'settings' => '設定',
'compose' => '新規投稿', 'compose' => '新規投稿',
'logout' => 'Logout', 'logout' => 'ログアウト',
// Nav footer // Nav footer
'about' => 'このサーバーについて', 'about' => 'このサーバーについて',

Write Preview
Loading…
Cancel
Save