Merge branch 'dev'

lib/DDGC.pm

@@ -719,6 +719,16 @@ sub delete_user {
 		});
 		die "Deleted user account doesn't exist!" unless $deleted_user;
 		die "You can't delete the deleted account!" if $deleted_user->username eq $user->username;
+		my $prosody_user_rs;
+		if ($self->config->prosody_running) {
+			$prosody_user_rs = $self->xmpp->_prosody->_db->resultset('Prosody')->search({
+				host => $self->config->prosody_userhost,
+				user => lc($username),
+			});
+			if (!$prosody_user_rs) {
+				croak('Unable to find user in Prosody store - bailing out!');
+			}
+		}
 		my $guard = $self->db->txn_scope_guard;
 		my @translations = $user->token_language_translations->search({})->all;
 		for (@translations) {
@@ -739,15 +749,16 @@ sub delete_user {
 		for (@comments) {
 			$_->content("This user account has been deleted.");
 			$_->users_id($deleted_user->id);
-			$_->update;
+			$_->update({ 'updated' => $_->created });
 		}
-		$guard->commit;
-		if ($self->config->prosody_running) {
-			$self->xmpp->_prosody->_db->resultset('Prosody')->search({
-				host => $self->config->prosody_userhost,
-				user => $username,
-			})->delete;
+		my @threads = $user->threads->search({})->all;
+		for (@threads) {
+			$_->users_id($deleted_user->id);
+			$_->ghosted(1);
+			$_->update({ 'updated' => $_->created });
 		}
+		$guard->commit;
+		($prosody_user_rs) && $prosody_user_rs->delete;
 	}
 	return 1;
 }

lib/DDGC/Web/Controller/My.pm

@@ -255,12 +255,22 @@ sub delete :Chained('logged_in') :Args(0) {
 
 	if (!$c->user->check_password($c->req->params->{password})) {
 		$c->stash->{wrong_password} = 1;
-		return;
+		return $c->detach;
 	}
 
 	if ($c->req->params->{delete_profile}) {
 		my $username = $c->user->username;
-		$c->d->delete_user($username);
+		my $delete_error = 0;
+		try {
+			$c->d->delete_user($username);
+		}
+		catch {
+			$delete_error = 1;
+		};
+		if ($delete_error) {
+			$c->stash->{delete_error} = 1;
+			return $c->detach;
+		}
 		$c->logout;
 		$c->response->redirect($c->chained_uri('Root','index'));
 		return $c->detach;

lib/DDGC/Web/Controller/Root.pm

@@ -5,7 +5,6 @@ use Moose;
 use Path::Class;
 use DateTime;
 use DateTime::Duration;
-use URL::Encode 'url_decode_utf8';
 
 use namespace::autoclean;
 
@@ -215,7 +214,7 @@ sub redirect_duckco :Chained('base') :PathPart('topic') :Args(1) {
 sub redir :Chained('base') :PathPart('redir') :Args(0) {
 	my ( $self, $c ) = @_;
 	$c->stash->{not_last_url} = 1;
-	$c->session->{r_url} = url_decode_utf8($c->req->param('u'));
+	$c->session->{r_url} = $c->req->param('u');
 	$c->session->{r_referer_validated} = (index($c->req->headers->referer, $c->req->base->as_string) == 0) ? 1 : 0;
 	$c->response->redirect($c->chained_uri('Root','r'));
 	return $c->detach;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddg_community_platform",
-  "version": "0.52.0",
+  "version": "0.53.0",
   "engines": {
     "node": ">=0.10.0"
   },