From 2f17fe1c1a34258e89e4ec42b15c61957e29791c Mon Sep 17 00:00:00 2001
From: rexy712 <rexerton.rexy@tutamail.com>
Date: Mon, 28 Oct 2019 13:06:23 -0700
Subject: [PATCH] Fix infinite recursion

---
 include/matrix/iterable.hpp     |  2 +-
 include/matrix/json_targets.hpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/matrix/iterable.hpp b/include/matrix/iterable.hpp
index 39f3f89..14bb2e0 100644
--- a/include/matrix/iterable.hpp
+++ b/include/matrix/iterable.hpp
@@ -74,7 +74,7 @@ namespace matrix::sync{
 				m_event(i.m_event), m_roomid(i.m_roomid){}
 			constexpr room_event_iterator& operator=(const room_event_iterator& i){
 				room_event_iterator tmp(i);
-				return (*this = tmp);
+				return (*this = std::move(tmp));
 			}
 			constexpr room_event_iterator& operator=(room_event_iterator&& i){
 				m_event = i.m_event;
diff --git a/include/matrix/json_targets.hpp b/include/matrix/json_targets.hpp
index 41c7fe0..78ae827 100644
--- a/include/matrix/json_targets.hpp
+++ b/include/matrix/json_targets.hpp
@@ -15,10 +15,10 @@ namespace matrix::json{
 			constexpr raii::static_string size(void){return "size"_ss;}
 			constexpr raii::static_string thumbinfo(void){return "thumbnail_info"_ss;}
 			namespace thumbnail{
-				constexpr raii::static_string height(void){return height();}
-				constexpr raii::static_string width(void){return width();}
-				constexpr raii::static_string mimetype(void){return mimetype();}
-				constexpr raii::static_string size(void){return size();}
+				constexpr raii::static_string height(void){return message::infobody::height();}
+				constexpr raii::static_string width(void){return message::infobody::width();}
+				constexpr raii::static_string mimetype(void){return message::infobody::mimetype();}
+				constexpr raii::static_string size(void){return message::infobody::size();}
 			}
 			constexpr raii::static_string thumburl(void){return "thumbnail_url"_ss;}
 		}
@@ -32,10 +32,10 @@ namespace matrix::json{
 		constexpr raii::static_string password(void){return "password"_ss;}
 		constexpr raii::static_string newpassword(void){return "new_password"_ss;}
 		namespace identifierbody{
-			constexpr raii::static_string type(void){return type();}
+			constexpr raii::static_string type(void){return auth::type();}
 			constexpr raii::static_string user(void){return "user"_ss;}
 			constexpr raii::static_string session(void){return "session"_ss;}
-			constexpr raii::static_string password(void){return password();}
+			constexpr raii::static_string password(void){return auth::password();}
 		}
 	}