From 7ff83424592cd5a3c58fe2e6d7e67aeef5144caf Mon Sep 17 00:00:00 2001 From: horus Date: Sat, 27 Jun 2026 05:40:45 +0200 Subject: merge --- .../Controllers/Auth/ConfirmPasswordController.php | 40 ---- .../Controllers/Auth/ForgotPasswordController.php | 22 -- ssh/app/Http/Controllers/Auth/LoginController.php | 40 ---- .../Http/Controllers/Auth/RegisterController.php | 73 ------- .../Controllers/Auth/ResetPasswordController.php | 30 --- .../Controllers/Auth/VerificationController.php | 42 ---- ssh/app/Http/Controllers/CinemaController.php | 233 --------------------- ssh/app/Http/Controllers/Controller.php | 13 -- ssh/app/Http/Controllers/FeedController.php | 97 --------- ssh/app/Http/Controllers/HomeController.php | 28 --- ssh/app/Http/Controllers/IndexController.php | 150 ------------- 11 files changed, 768 deletions(-) delete mode 100644 ssh/app/Http/Controllers/Auth/ConfirmPasswordController.php delete mode 100644 ssh/app/Http/Controllers/Auth/ForgotPasswordController.php delete mode 100644 ssh/app/Http/Controllers/Auth/LoginController.php delete mode 100644 ssh/app/Http/Controllers/Auth/RegisterController.php delete mode 100644 ssh/app/Http/Controllers/Auth/ResetPasswordController.php delete mode 100644 ssh/app/Http/Controllers/Auth/VerificationController.php delete mode 100644 ssh/app/Http/Controllers/CinemaController.php delete mode 100644 ssh/app/Http/Controllers/Controller.php delete mode 100644 ssh/app/Http/Controllers/FeedController.php delete mode 100644 ssh/app/Http/Controllers/HomeController.php delete mode 100644 ssh/app/Http/Controllers/IndexController.php (limited to 'ssh/app/Http/Controllers') diff --git a/ssh/app/Http/Controllers/Auth/ConfirmPasswordController.php b/ssh/app/Http/Controllers/Auth/ConfirmPasswordController.php deleted file mode 100644 index 138c1f0..0000000 --- a/ssh/app/Http/Controllers/Auth/ConfirmPasswordController.php +++ /dev/null @@ -1,40 +0,0 @@ -middleware('auth'); - } -} diff --git a/ssh/app/Http/Controllers/Auth/ForgotPasswordController.php b/ssh/app/Http/Controllers/Auth/ForgotPasswordController.php deleted file mode 100644 index 465c39c..0000000 --- a/ssh/app/Http/Controllers/Auth/ForgotPasswordController.php +++ /dev/null @@ -1,22 +0,0 @@ -middleware('guest')->except('logout'); - } -} diff --git a/ssh/app/Http/Controllers/Auth/RegisterController.php b/ssh/app/Http/Controllers/Auth/RegisterController.php deleted file mode 100644 index c6a6de6..0000000 --- a/ssh/app/Http/Controllers/Auth/RegisterController.php +++ /dev/null @@ -1,73 +0,0 @@ -middleware('guest'); - } - - /** - * Get a validator for an incoming registration request. - * - * @param array $data - * @return \Illuminate\Contracts\Validation\Validator - */ - protected function validator(array $data) - { - return Validator::make($data, [ - 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], - 'password' => ['required', 'string', 'min:8', 'confirmed'], - ]); - } - - /** - * Create a new user instance after a valid registration. - * - * @param array $data - * @return \App\User - */ - protected function create(array $data) - { - return User::create([ - 'name' => $data['name'], - 'email' => $data['email'], - 'password' => Hash::make($data['password']), - ]); - } -} diff --git a/ssh/app/Http/Controllers/Auth/ResetPasswordController.php b/ssh/app/Http/Controllers/Auth/ResetPasswordController.php deleted file mode 100644 index b1726a3..0000000 --- a/ssh/app/Http/Controllers/Auth/ResetPasswordController.php +++ /dev/null @@ -1,30 +0,0 @@ -middleware('auth'); - $this->middleware('signed')->only('verify'); - $this->middleware('throttle:6,1')->only('verify', 'resend'); - } -} diff --git a/ssh/app/Http/Controllers/CinemaController.php b/ssh/app/Http/Controllers/CinemaController.php deleted file mode 100644 index 75c93aa..0000000 --- a/ssh/app/Http/Controllers/CinemaController.php +++ /dev/null @@ -1,233 +0,0 @@ -input('order', 'ref_count'); - $direction = $request->input('direction', 'desc'); - $validOrders = ['ref_count', 'score', 'num_votes', 'num_accolades', 'start_year']; - $validDirections = ['asc', 'desc']; - if (! in_array($order, $validOrders)) { - $order = 'ref_count'; - } - if (! in_array($direction, $validDirections)) { - $direction = 'desc'; - } - - $refCounts = DB::connection('cinema') - ->table('links') - ->select('links.param', DB::raw('COUNT(*) as ref_count')) - ->where('links.host', 'www.imdb.com') - ->where('links.field', 1) - ->groupBy('links.param'); - - $movies = DB::connection('cinema') - ->table('imdb') - ->select( - 'imdb.id', - 'imdb.imdb_id', - 'imdb.primary_title', - 'imdb.original_title', - 'imdb.start_year', - 'imdb.average_rating', - 'imdb.num_votes', - 'imdb.synopsis', - 'imdb.poster_url', - 'imdb.title_type', - 'imdb.runtime_minutes', - 'imdb.has_people', - 'imdb.average_rating as score', - 'imdb.num_accolades', - DB::raw('COALESCE(ref.ref_count, 0) as ref_count') - ) - ->leftJoinSub($refCounts, 'ref', function ($join) { - $join->on('ref.param', '=', 'imdb.imdb_id'); - }) - ->whereNotNull('imdb.primary_title') - ->whereNotNull('imdb.wiki_article') - ->where('imdb.title_type', 'movie') - ->orderBy($order, $direction) - ->simplePaginate(12); - - $total = DB::connection('cinema') - ->table('imdb') - ->whereNotNull('primary_title') - ->whereNotNull('wiki_article') - ->where('title_type', 'movie') - ->count(); - - return view('cinema', ['movies' => $movies, 'count' => $total, 'order' => $order, 'direction' => $direction]); - } - - public function show($id) - { - $movie = DB::connection('cinema') - ->table('imdb') - ->where('imdb.imdb_id', $id) - ->first(); - - if (! $movie) { - abort(404); - } - - $genres = DB::connection('cinema') - ->table('imdb_genre') - ->join('genre', 'genre.id', '=', 'imdb_genre.genre_id') - ->where('imdb_genre.imdb_id', $movie->id) - ->pluck('genre.name'); - - $casts = DB::connection('cinema') - ->table('who') - ->join('people', 'people.id', '=', 'who.people_id') - ->join('profession', 'profession.id', '=', 'who.profession_id') - ->where('who.imdb_id', $movie->id) - ->select('people.name', 'profession.name as profession') - ->get(); - - $actors = $casts->where('profession', 'actor')->take(8); - $directors = $casts->where('profession', 'director'); - $screenwriters = $casts->where('profession', 'screenwriter')->take(3); - - $hnStories = DB::connection('cinema') - ->table('links') - ->join('story', 'story.id', '=', 'links.story_id') - ->select( - 'story.story_id', - 'story.title', - 'story.type', - 'story.text', - 'story.score', - 'story.descendants', - 'story.time' - ) - ->where('links.host', 'www.imdb.com') - ->where('links.field', 1) - ->where('links.param', $id) - ->orderBy('story.time', 'desc') - ->get(); - - return view('cinema_show', [ - 'movie' => $movie, - 'genres' => $genres, - 'actors' => $actors, - 'directors' => $directors, - 'screenwriters' => $screenwriters, - 'hnStories' => $hnStories, - ]); - } - - public function genres() - { - $genres = DB::connection('cinema') - ->table('genre') - ->select('genre.name', DB::raw('COUNT(imdb_genre.imdb_id) as count')) - ->join('imdb_genre', 'imdb_genre.genre_id', '=', 'genre.id') - ->join('imdb', 'imdb.id', '=', 'imdb_genre.imdb_id') - ->whereNotNull('imdb.primary_title') - ->whereNotNull('imdb.wiki_article') - ->where('imdb.title_type', 'movie') - ->groupBy('genre.name') - ->orderBy('count', 'desc') - ->get(); - - return view('genres', ['genres' => $genres]); - } - - public function genre($name) - { - $genre = DB::connection('cinema') - ->table('genre') - ->where('name', $name) - ->first(); - - if (! $genre) { - abort(404); - } - - $movies = DB::connection('cinema') - ->table('imdb') - ->select( - 'imdb.id', - 'imdb.imdb_id', - 'imdb.primary_title', - 'imdb.original_title', - 'imdb.start_year', - 'imdb.average_rating', - 'imdb.num_votes', - 'imdb.synopsis', - 'imdb.poster_url', - 'imdb.title_type', - 'imdb.runtime_minutes' - ) - ->join('imdb_genre', 'imdb_genre.imdb_id', '=', 'imdb.id') - ->join('genre', 'genre.id', '=', 'imdb_genre.genre_id') - ->where('genre.name', $name) - ->whereNotNull('imdb.primary_title') - ->whereNotNull('imdb.wiki_article') - ->where('imdb.title_type', 'movie') - ->orderBy('imdb.average_rating', 'desc') - ->simplePaginate(12); - - $count = DB::connection('cinema') - ->table('imdb') - ->join('imdb_genre', 'imdb_genre.imdb_id', '=', 'imdb.id') - ->join('genre', 'genre.id', '=', 'imdb_genre.genre_id') - ->where('genre.name', $name) - ->whereNotNull('imdb.primary_title') - ->whereNotNull('imdb.wiki_article') - ->where('imdb.title_type', 'movie') - ->count(); - - return view('genre_movies', ['movies' => $movies, 'count' => $count, 'genre_name' => $name]); - } - - public function search(Request $request) - { - $query = $request->input('q', ''); - - $movies = DB::connection('cinema') - ->table('imdb') - ->select( - 'imdb.id', - 'imdb.imdb_id', - 'imdb.primary_title', - 'imdb.original_title', - 'imdb.start_year', - 'imdb.average_rating', - 'imdb.num_votes', - 'imdb.synopsis', - 'imdb.poster_url', - 'imdb.title_type', - 'imdb.runtime_minutes' - ) - ->whereNotNull('imdb.primary_title') - ->whereNotNull('imdb.wiki_article') - ->where('imdb.title_type', 'movie') - ->where(function ($q) use ($query) { - $q->where('imdb.primary_title', 'like', '%' . $query . '%') - ->orWhere('imdb.original_title', 'like', '%' . $query . '%') - ->orWhere('imdb.synopsis', 'like', '%' . $query . '%'); - }) - ->simplePaginate(12); - - $total = DB::connection('cinema') - ->table('imdb') - ->whereNotNull('primary_title') - ->whereNotNull('wiki_article') - ->where('title_type', 'movie') - ->where(function ($q) use ($query) { - $q->where('primary_title', 'like', '%' . $query . '%') - ->orWhere('original_title', 'like', '%' . $query . '%') - ->orWhere('synopsis', 'like', '%' . $query . '%'); - }) - ->count(); - - return view('cinema', ['movies' => $movies, 'count' => $total, 'search_query' => $query]); - } -} diff --git a/ssh/app/Http/Controllers/Controller.php b/ssh/app/Http/Controllers/Controller.php deleted file mode 100644 index a0a2a8a..0000000 --- a/ssh/app/Http/Controllers/Controller.php +++ /dev/null @@ -1,13 +0,0 @@ -select('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->groupBy('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->where('view_article.created_at', '<', now()->subMinutes(30)) - ->orderByRaw('MAX(discussion.posted_on) DESC') - ->take(20) - ->get(); - - return Helper::makeFeed($articles, "new"); - } - - public function mastodon() - { - $articles = Article::join('discussion', 'discussion.article_id', '=', 'view_article.id') - ->select('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->groupBy('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->where('view_article.created_at', '<', now()->subMinutes(30)) - ->orderByRaw('MAX(discussion.posted_on) DESC') - ->take(20) - ->get(); - return Helper::makeFeed($articles, "mastodon"); - } - public function mastodon_test() - { - $articles = Article::join('discussion', 'discussion.article_id', '=', 'view_article.id') - ->select('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->groupBy('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->where('view_article.created_at', '<', now()->subMinutes(30)) - ->orderByRaw('MAX(discussion.posted_on) DESC') - ->take(20) - ->get(); - return Helper::makeFeed($articles, "mastodon_test"); - } - - public function popular() - { - - $articles = new Article; - $articles = $articles->setTable('view_popular'); - $articles = $articles->take(20)->get(); - return Helper::makeFeed($articles, "popular"); - } - - public function search(Request $request) { - $search_unsafe = $request->input("q"); - - if ( "" == $search_unsafe ) { - $search_unsafe = ""; - } - - $search_unsafe = explode(",", $request->input("q")); - - $articles = new Article; - - if ( "on" == $request->input("onlypopular") ) { - $articles = $articles->setTable('view_popular'); - } - - foreach($search_unsafe as $q) { - $q = Helper::escapeLike($q); - $q = "%".$q."%"; - $articles = $articles->where(function ($query) use ($q) { - $query->whereHas('getCategories', function ($query) use ($q){ - $query->where('name', 'like', $q); - }) - ->orWhere('title', 'like', $q) - ->orWhere('url', 'like', $q) - ->orWhere('excerpt_html', 'like', $q); - }); - } - $count = $articles->count(); - - if ( "on" == $request->input("onlypopular") ) { - $articles = $articles->orderBy('impact', 'desc'); - } - $articles = $articles->orderBy('created_at', 'desc'); - - return Helper::makeFeed($articles->take(20)->get(), $request->input("q")); - } -} diff --git a/ssh/app/Http/Controllers/HomeController.php b/ssh/app/Http/Controllers/HomeController.php deleted file mode 100644 index 7cbc2c3..0000000 --- a/ssh/app/Http/Controllers/HomeController.php +++ /dev/null @@ -1,28 +0,0 @@ -middleware('auth'); - } - - /** - * Show the application dashboard. - * - * @return \Illuminate\Contracts\Support\Renderable - */ - public function index() - { - return view('home'); - } -} diff --git a/ssh/app/Http/Controllers/IndexController.php b/ssh/app/Http/Controllers/IndexController.php deleted file mode 100644 index 7e7b31b..0000000 --- a/ssh/app/Http/Controllers/IndexController.php +++ /dev/null @@ -1,150 +0,0 @@ - $count_articles->count, - "count_discussions" => $count_discussions->count, - "count_comments" => number_format($count_comments->count), - "count_upvotes" => number_format($count_upvotes->count)]); - } - - public function topic( $topic ) - { - $articles = new Category; - $articles = $articles->orWhere('name', $topic); - $articles = $articles->get()->first(); - if ( is_null($articles) ) { - abort(404); - } - $articles = $articles->getArticles(); - $articles = $articles->orderBy('impact', 'desc'); - $count = $articles->count(); - $articles = $articles->simplePaginate(10); - - return view('list', ["articles" => $articles, "count" => $count]); - } - - public function new() - { - $articles = Article::join('discussion', 'discussion.article_id', '=', 'view_article.id') - ->select('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->groupBy('view_article.id', 'view_article.article_id', 'view_article.url', 'view_article.title', 'view_article.excerpt_html', 'view_article.impact', 'view_article.upvotes', 'view_article.comments', 'view_article.repost') - ->orderByRaw('MAX(discussion.posted_on) DESC'); - - $count = $articles->count(); - $articles = $articles->simplePaginate(10); - - return view('list', ["articles" => $articles, "count" => $count]); - } - - public function show( $id ) { - $articles = Article::where('id', $id); - $articles = $articles->simplePaginate(10); - $page_title = ""; - foreach($articles as $a) { - $page_title = $a->title; - } - return view('list', ["articles" => $articles, "count" => 1, "page_title" => $page_title]); - } - - public function search(Request $request) { - $search_unsafe = $request->input("q"); - - if ( "" == $search_unsafe ) { - $search_unsafe = ""; - } - - $search_unsafe = explode(",", $request->input("q")); - - $articles = new Article; - - if ( "on" == $request->input("onlypopular") ) { - $articles = $articles->setTable('view_popular'); - } - - foreach($search_unsafe as $q) { - $q = Helper::escapeLike($q); - $q = "%".$q."%"; - $articles = $articles->where(function ($query) use ($q) { - $query->whereHas('getCategories', function ($query) use ($q){ - $query->where('name', 'like', $q); - }) - ->orWhere('title', 'like', $q) - ->orWhere('excerpt_html', 'like', $q); - }); - } - $count = $articles->count(); - - if ( "on" == $request->input("onlypopular") ) { - $articles = $articles->orderBy('impact', 'desc'); - } - $articles = $articles->orderBy('created_at', 'desc'); - $articles = $articles->simplePaginate(10); - - return view('list', ["articles" => $articles, "count" => $count]); - } - - public function popular() - { - $articles = new Article; - $articles = $articles->setTable('view_popular'); - $count = $articles->count(); - $articles = $articles->simplePaginate(10); - - return view('list', ["articles" => $articles, "count" => $count]); - } - - function topicindex() { - $categories = Category::orderBy('name'); - $letters = DB::select("SELECT DISTINCT LEFT(name, 1) as name FROM category ORDER BY left(name, 1);"); - - return view('topicindex', ['topics' => $categories, 'letters' => $letters]); - } - - public function random() { - $articles = new Article; - $articles = $articles->inRandomOrder(); - $count = $articles->count(); - $articles = $articles->simplePaginate(10); - - return view('list', ["articles" => $articles, "count" => $count]); - } - - public function populartopics() { - $topics = DB::select(" - SELECT - c.name, - count(c.name) AS count - FROM category AS c - JOIN - article_category AS ac ON c.id = ac.category_id - GROUP BY - c.name - ORDER BY count(c.name) DESC;"); -#echo "
"; var_dump($topics);exit;
-
-	    return view('topicpopular', ['topics' => $topics ]);
-    }
-}
-- 
cgit v1.2.3