]> Untitled Git - lemmy.git/commitdiff
Fixes regression from #848
authorPierce <contact@mokou.io>
Wed, 8 Jul 2020 06:20:08 +0000 (02:20 -0400)
committerGitHub <noreply@github.com>
Wed, 8 Jul 2020 06:20:08 +0000 (02:20 -0400)
The api for actix_web::dev::ConnectionInfo changed from 2.0.0 to 3.0.0. The equivalent of 2.0.0's remote() in 3.0.0 is realip_remote_addr(), not remote_addr().

https://docs.rs/actix-web/2.0.0/actix_web/dev/struct.ConnectionInfo.html#method.remote
https://docs.rs/actix-web/3.0.0-alpha.3/actix_web/dev/struct.ConnectionInfo.html#method.realip_remote_addr

server/src/lib.rs

index 04f376fb4021761a9fa0d198510e6a4e4631a942..08c3fa98a145c4aa6742a1b7559db3d875676c43 100644 (file)
@@ -325,7 +325,7 @@ pub fn markdown_to_html(text: &str) -> String {
 
 pub fn get_ip(conn_info: &ConnectionInfo) -> String {
   conn_info
-    .remote_addr()
+    .realip_remote_addr()
     .unwrap_or("127.0.0.1:12345")
     .split(':')
     .next()