-
-
](https://oscillas.com/)
-- Managed Pixelfed Hosting by [Spacebear](https://app.spacebear.ee/)
+Internet](https://ngi.eu) initiative.
\ No newline at end of file
diff --git a/app/Console/Commands/FixUsernames.php b/app/Console/Commands/FixUsernames.php
index 5ba49a6a0..5269c8469 100644
--- a/app/Console/Commands/FixUsernames.php
+++ b/app/Console/Commands/FixUsernames.php
@@ -40,8 +40,14 @@ class FixUsernames extends Command
*/
public function handle()
{
+ $this->line(' ');
$this->info('Collecting data ...');
+ $this->line(' ');
+ $this->restrictedCheck();
+ }
+ protected function restrictedCheck()
+ {
$affected = collect([]);
$restricted = RestrictedNames::get();
@@ -61,6 +67,7 @@ class FixUsernames extends Command
}
}
});
+
if($affected->count() > 0) {
$this->info('Found: ' . $affected->count() . ' affected usernames');
@@ -118,7 +125,40 @@ class FixUsernames extends Command
$this->info('Fixed ' . $affected->count() . ' usernames!');
} else {
- $this->info('No affected usernames found!');
+ $this->info('No restricted usernames found!');
}
+ $this->line(' ');
+ $this->versionZeroTenNineFix();
+ }
+
+ protected function versionZeroTenNineFix()
+ {
+ $profiles = Profile::whereNotNull('domain')
+ ->whereNull('private_key')
+ ->where('username', 'not like', '@%@%')
+ ->get();
+
+ $count = $profiles->count();
+
+ if($count > 0) {
+ $this->info("Found {$count} remote usernames to fix ...");
+ $this->line(' ');
+ } else {
+ $this->info('No remote fixes found!');
+ $this->line(' ');
+ return;
+ }
+ foreach($profiles as $p) {
+ $this->info("Fixed $p->username => $p->webfinger");
+ $p->username = $p->webfinger ?? "@{$p->username}@{$p->domain}";
+ if(Profile::whereUsername($p->username)->exists()) {
+ return;
+ }
+ $p->save();
+ }
+ if($count > 0) {
+ $this->line(' ');
+ }
+
}
}
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index be506ea4e..332b679fb 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -61,6 +61,10 @@ class SearchController extends Controller
$this->webfingerSearch();
break;
+ case 'remote':
+ $this->remoteLookupSearch();
+ break;
+
default:
break;
}
@@ -179,24 +183,15 @@ class SearchController extends Controller
'following' => $item->followedBy(Auth::user()->profile),
'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
'thumb' => $item->avatarUrl(),
- 'local' => (bool) !$item->domain
+ 'local' => (bool) !$item->domain,
+ 'post_count' => $item->statuses()->count()
]
]];
return $tokens;
});
}
}
- // elseif( Str::containsAll($tag, ['@', '.'])
- // config('federation.activitypub.enabled') == true &&
- // config('federation.activitypub.remoteFollow') == true
- // ) {
- // if(substr_count($tag, '@') == 2) {
- // $domain = last(explode('@', sub_str($u, 1)));
- // } else {
- // $domain = last(explode('@', $u));
- // }
- // }
else {
$this->tokens['profiles'] = Cache::remember($key, $ttl, function() use($tag) {
$users = Profile::select('domain', 'username', 'name', 'id')
@@ -268,4 +263,53 @@ class SearchController extends Controller
];
return;
}
+
+ protected function remotePostLookup()
+ {
+ $tag = $this->term;
+ $hash = hash('sha256', $tag);
+ $local = Helpers::validateLocalUrl($tag);
+ $valid = Helpers::validateUrl($tag);
+
+ if($valid == false || $local == true) {
+ return;
+ }
+
+ if(Status::whereUri($tag)->whereLocal(false)->exists()) {
+ $item = Status::whereUri($tag)->first();
+ $this->tokens['posts'] = [[
+ 'count' => 0,
+ 'url' => "/i/web/post/_/$item->profile_id/$item->id",
+ 'type' => 'status',
+ 'username' => $item->profile->username,
+ 'caption' => $item->rendered ?? $item->caption,
+ 'thumb' => $item->firstMedia()->remote_url,
+ 'timestamp' => $item->created_at->diffForHumans()
+ ]];
+ }
+
+ $remote = Helpers::fetchFromUrl($tag);
+
+ if(isset($remote['type']) && $remote['type'] == 'Note') {
+ $item = Helpers::statusFetch($tag);
+ $this->tokens['posts'] = [[
+ 'count' => 0,
+ 'url' => "/i/web/post/_/$item->profile_id/$item->id",
+ 'type' => 'status',
+ 'username' => $item->profile->username,
+ 'caption' => $item->rendered ?? $item->caption,
+ 'thumb' => $item->firstMedia()->remote_url,
+ 'timestamp' => $item->created_at->diffForHumans()
+ ]];
+ }
+ }
+
+ protected function remoteLookupSearch()
+ {
+ if(!Helpers::validateUrl($this->term)) {
+ return;
+ }
+ $this->getProfiles();
+ $this->remotePostLookup();
+ }
}
\ No newline at end of file
diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index ba3517314..b68b6fd84 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -416,7 +416,7 @@ class Helpers {
if(!$profile) {
$profile = new Profile();
$profile->domain = strtolower($domain);
- $profile->username = strtolower(Purify::clean($remoteUsername));
+ $profile->username = strtolower(Purify::clean($webfinger));
$profile->name = isset($res['name']) ? Purify::clean($res['name']) : 'user';
$profile->bio = isset($res['summary']) ? Purify::clean($res['summary']) : null;
$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
diff --git a/public/js/search.js b/public/js/search.js
index acfbfdd18..b4361fe3f 100644
--- a/public/js/search.js
+++ b/public/js/search.js
@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[20],{"51wX":function(t,e,s){var r=s("zZx1");"string"==typeof r&&(r=[[t.i,r,""]]);var a={hmr:!0,transform:void 0,insertInto:void 0};s("aET+")(r,a);r.locals&&(t.exports=r.locals)},9:function(t,e,s){t.exports=s("EnJJ")},"9tPo":function(t,e){t.exports=function(t){var e="undefined"!=typeof window&&window.location;if(!e)throw new Error("fixUrls requires window.location");if(!t||"string"!=typeof t)return t;var s=e.protocol+"//"+e.host,r=s+e.pathname.replace(/\/[^\/]*$/,"/");return t.replace(/url\s*\(((?:[^)(]|\((?:[^)(]+|\([^)(]*\))*\))*)\)/gi,(function(t,e){var a,n=e.trim().replace(/^"(.*)"$/,(function(t,e){return e})).replace(/^'(.*)'$/,(function(t,e){return e}));return/^(#|data:|http:\/\/|https:\/\/|file:\/\/\/|\s*$)/i.test(n)?t:(a=0===n.indexOf("//")?n:0===n.indexOf("/")?s+n:r+n.replace(/^\.\//,""),"url("+JSON.stringify(a)+")")}))}},EnJJ:function(t,e,s){Vue.component("search-results",s("IpYn").default)},I1BE:function(t,e){t.exports=function(t){var e=[];return e.toString=function(){return this.map((function(e){var s=function(t,e){var s=t[1]||"",r=t[3];if(!r)return s;if(e&&"function"==typeof btoa){var a=(i=r,"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(i))))+" */"),n=r.sources.map((function(t){return"/*# sourceURL="+r.sourceRoot+t+" */"}));return[s].concat(n).concat([a]).join("\n")}var i;return[s].join("\n")}(e,t);return e[2]?"@media "+e[2]+"{"+s+"}":s})).join("")},e.i=function(t,s){"string"==typeof t&&(t=[[null,t,""]]);for(var r={},a=0;aShowing results for {{query}}
+
+ {{status.username}}
+{{status.timestamp}}
+No results found